Package: pork
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 9e55977a6ad6f8c776a5a728a8ca47f0e5cb6b85 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 30 Apr 2012 20:52:51 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 13 ++++++++
debian/compat | 2 +-
debian/control | 5 +--
debian/copyright | 12 ++++---
...eam.dpatch => 001-fix-msg-types-upstream.patch} | 8 ++---
...upstream.dpatch => 002-wireless-upstream.patch} | 8 ++---
...patch => 003-blist-toggle-focus-upstream.patch} | 8 ++---
debian/patches/00list | 4 ---
...1_fix_makefile.dpatch => 01-fix-makefile.patch} | 8 ++---
debian/patches/series | 4 +++
debian/rules | 33 +++++---------------
debian/source/format | 1 +
12 files changed, 45 insertions(+), 61 deletions(-)
rename debian/patches/{001_fix-msg-types_upstream.dpatch => 001-fix-msg-types-upstream.patch} (76%)
rename debian/patches/{002_wireless_upstream.dpatch => 002-wireless-upstream.patch} (93%)
rename debian/patches/{003_blist_toggle_focus_upstream.dpatch => 003-blist-toggle-focus-upstream.patch} (83%)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix_makefile.dpatch => 01-fix-makefile.patch} (81%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 99dae3d..2d41be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+pork (0.99.8.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Mon, 30 Apr 2012 20:47:25 +0300
+
pork (0.99.8.1-2) unstable; urgency=low
* Remove dependency on automake1.8 (Closes: #473353)
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index b129fac..ee77d58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: pork
Section: net
Priority: optional
Maintainer: Benjamin Seidenberg <benja...@debian.org>
-Build-Depends: debhelper (>> 4.0.0), libncurses5-dev, libperl-dev, dpatch, automake, autoconf
-Standards-Version: 3.7.0
+Build-Depends: debhelper (>= 9), libncurses5-dev, libperl-dev, automake, autoconf
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/pork
Package: pork
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index f091762..0481f28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,19 @@
This package was debianized by Ari Pollak <a...@debian.org> on
Sat, 19 Apr 2003 21:21:51 -0400.
-It was downloaded from <http//dev.ojnk.net>
+It was downloaded from <http://dev.ojnk.net>
The package was adopted by Benjamin Seidenberg <astro...@dlgeek.net> on
Mon, 1 May 2006 22:25:25 -0400. Any changes past version 0.99.7-2 are his.
Upstream Authors:
-Ryan McCabe <r...@numb.org>
-Amber Adams <am...@ojnk.net>
+
+Copyright (C) 2002-2005 Ryan McCabe <r...@numb.org>
+Copyright (C) 2002-2004 Amber Adams <am...@ojnk.net>
Copyright:
-Its license is GPLv2, which, on Debian systems, is available at:
-/usr/share/common-licenses/GPL.
+Its license is GPL-2+.
+On Debian systems, the complete text of the GNU General
+Public License can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/001_fix-msg-types_upstream.dpatch b/debian/patches/001-fix-msg-types-upstream.patch
similarity index 76%
rename from debian/patches/001_fix-msg-types_upstream.dpatch
rename to debian/patches/001-fix-msg-types-upstream.patch
index 26e5ac6..d2a5348 100644
--- a/debian/patches/001_fix-msg-types_upstream.dpatch
+++ b/debian/patches/001-fix-msg-types-upstream.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix-msg-types_upstream.dpatch by Benjamin Seidenberg <astro...@dlgeek.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream patch to fix messsage types
+From: Benjamin Seidenberg <astro...@dlgeek.net>
+Subject: Upstream patch to fix messsage types
-@DPATCH@
diff -urNad pork-0.99.8.1~/src/pork_screen_io.c pork-0.99.8.1/src/pork_screen_io.c
--- pork-0.99.8.1~/src/pork_screen_io.c 2005-05-04 15:38:13.000000000 -0400
+++ pork-0.99.8.1/src/pork_screen_io.c 2006-05-01 20:01:45.000000000 -0400
diff --git a/debian/patches/002_wireless_upstream.dpatch b/debian/patches/002-wireless-upstream.patch
similarity index 93%
rename from debian/patches/002_wireless_upstream.dpatch
rename to debian/patches/002-wireless-upstream.patch
index 39001e7..c0f4927 100644
--- a/debian/patches/002_wireless_upstream.dpatch
+++ b/debian/patches/002-wireless-upstream.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_wireless_upstream.dpatch by Benjamin Seidenberg <astro...@dlgeek.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream patch to recognize wireless users
+From: Benjamin Seidenberg <astro...@dlgeek.net>
+Subject: Upstream patch to recognize wireless users
-@DPATCH@
diff -urNad pork-0.99.8.1~/doc/help/main/set pork-0.99.8.1/doc/help/main/set
--- pork-0.99.8.1~/doc/help/main/set 2005-04-28 13:35:16.000000000 -0400
+++ pork-0.99.8.1/doc/help/main/set 2006-05-01 20:02:11.000000000 -0400
diff --git a/debian/patches/003_blist_toggle_focus_upstream.dpatch b/debian/patches/003-blist-toggle-focus-upstream.patch
similarity index 83%
rename from debian/patches/003_blist_toggle_focus_upstream.dpatch
rename to debian/patches/003-blist-toggle-focus-upstream.patch
index ead57b8..24981b3 100644
--- a/debian/patches/003_blist_toggle_focus_upstream.dpatch
+++ b/debian/patches/003-blist-toggle-focus-upstream.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_blist_toggle_focus_upstream.dpatch by Benjamin Seidenberg <astro...@dlgeek.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream patch to toggle buddy list focus
+From: Benjamin Seidenberg <astro...@dlgeek.net>
+Subject: Upstream patch to toggle buddy list focus
-@DPATCH@
diff -urNad pork-0.99.8.1~/src/pork_command.c pork-0.99.8.1/src/pork_command.c
--- pork-0.99.8.1~/src/pork_command.c 2005-04-28 13:35:19.000000000 -0400
+++ pork-0.99.8.1/src/pork_command.c 2006-05-01 20:04:49.000000000 -0400
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f7a0f2c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-001_fix-msg-types_upstream.dpatch
-002_wireless_upstream.dpatch
-003_blist_toggle_focus_upstream.dpatch
-01_fix_makefile.dpatch
diff --git a/debian/patches/01_fix_makefile.dpatch b/debian/patches/01-fix-makefile.patch
similarity index 81%
rename from debian/patches/01_fix_makefile.dpatch
rename to debian/patches/01-fix-makefile.patch
index 182545c..36a103c 100644
--- a/debian/patches/01_fix_makefile.dpatch
+++ b/debian/patches/01-fix-makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_makefile.dpatch by Benjamin Seidenberg <astro...@dlgeek.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Benjamin Seidenberg <astro...@dlgeek.net>
+Subject: No description.
-@DPATCH@
diff -urNad pork-0.99.8.1~/doc/Makefile.am pork-0.99.8.1/doc/Makefile.am
--- pork-0.99.8.1~/doc/Makefile.am 2006-05-02 16:59:05.000000000 -0400
+++ pork-0.99.8.1/doc/Makefile.am 2006-05-02 17:44:47.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0c8043d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+001-fix-msg-types-upstream.patch
+002-wireless-upstream.patch
+003-blist-toggle-focus-upstream.patch
+01-fix-makefile.patch
diff --git a/debian/rules b/debian/rules
index c8fc683..05281c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,15 +25,18 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-config.status: patch configure
+config.status: configure
dh_testdir
# Fix location of porkrc
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
aclocal
autoconf
automake
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc
+build-arch: build
+build-indep: build
build: build-stamp
@@ -46,38 +49,18 @@ build-stamp: config.status
touch build-stamp
-clean: clean-patched unpatch
-
-clean-patched: configure
+clean: configure
dh_testdir
dh_testroot
- rm -f build-stamp
-
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f build-stamp config.guess config.sub
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/pork.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10
