Package: jwhois Severity: wishlist Tags: patch Hi Paul,
Here is the patch we spoke about earlier[*]. Some more Lintian fixes included. Thanks, Jari [*] 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>.
>From 70730bbbbfbe55b7addaf905eb263abf6c02d04c Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Sun, 8 Apr 2012 14:35:29 +0300 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/README.source | 38 ------------ debian/changelog | 10 +++ debian/compat | 2 +- debian/control | 4 +- debian/dirs | 1 - debian/patches/00list | 6 -- debian/patches/30_man_typo.dpatch | 60 -------------------- debian/patches/30_man_typo.patch | 56 ++++++++++++++++++ debian/patches/40_afrinic.dpatch | 19 ------ debian/patches/40_afrinic.patch | 18 ++++++ debian/patches/40_nic.or.kr.dpatch | 19 ------ debian/patches/40_nic.or.kr.patch | 18 ++++++ debian/patches/45_info_section.dpatch | 18 ------ debian/patches/45_info_section.patch | 17 ++++++ debian/patches/46_afrinic.dpatch | 19 ------ debian/patches/46_afrinic.patch | 18 ++++++ .../patches/{47_retval.dpatch => 47_retval.patch} | 8 +-- debian/patches/series | 6 ++ debian/rules | 18 ++---- debian/source/format | 1 + 20 files changed, 155 insertions(+), 201 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/00list delete mode 100644 debian/patches/30_man_typo.dpatch create mode 100644 debian/patches/30_man_typo.patch delete mode 100644 debian/patches/40_afrinic.dpatch create mode 100644 debian/patches/40_afrinic.patch delete mode 100644 debian/patches/40_nic.or.kr.dpatch create mode 100644 debian/patches/40_nic.or.kr.patch delete mode 100644 debian/patches/45_info_section.dpatch create mode 100644 debian/patches/45_info_section.patch delete mode 100644 debian/patches/46_afrinic.dpatch create mode 100644 debian/patches/46_afrinic.patch rename debian/patches/{47_retval.dpatch => 47_retval.patch} (65%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index fc98b3d..0000000 --- a/debian/README.source +++ /dev/null @@ -1,38 +0,0 @@ -This package uses dpatch to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To get the fully patched source after unpacking the source package, cd -to the root level of the source package and run: - - debian/rules patch - -Removing a patch is as simple as removing its entry from the -debian/patches/00list file, and please also remove the patch file -itself. - -Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" -where you should replace XX with a new number and patchname with a -descriptive shortname of the patch. You can then simply edit all the -files your patch wants to edit, and then simply "exit 0" from the shell -to actually create the patch file. - -To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" -and replace XX_patchname with the actual filename from debian/patches -you want to use. - -To clean up afterwards again, "debian/rules unpatch" will do the -work for you - or you can of course choose to call -"fakeroot debian/rules clean" all together. - - ---- - -this documentation is part of dpatch package, and may be used by -packages using dpatch to comply with policy on README.source. This -documentation is meant to be useful to users who are not proficient in -dpatch in doing work with dpatch-based packages. Please send any -improvements to the BTS of dpatch package. - -original text by Gerfried Fuchs, edited by Junichi Uekawa <[email protected]> -10 Aug 2008. diff --git a/debian/changelog b/debian/changelog index cb83fbd..5d899ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +jwhois (4.0-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.1 and debhelper to 9. + * Add build-arch and build-indep targets; use dh_prep in rules file. + * Fix package-contains-empty-directory usr/share/jwhois/ (Lintian). + + -- Jari Aalto <[email protected]> Sun, 08 Apr 2012 14:33:43 +0300 + jwhois (4.0-2) unstable; urgency=low * Updated to latest Debian standards diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 1575cdd..0abb620 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: jwhois Section: net Priority: optional Maintainer: Paul Dwerryhouse <[email protected]> -Build-Depends: debhelper (>= 7.0.0), gettext, libgdbm-dev, texinfo, dpatch +Build-Depends: debhelper (>= 9), gettext, libgdbm-dev, texinfo Homepage: http://www.gnu.org/software/jwhois/jwhois.html -Standards-Version: 3.8.4 +Standards-Version: 3.9.3.1 Package: jwhois Architecture: any diff --git a/debian/dirs b/debian/dirs index 8842217..b1717f4 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,3 +1,2 @@ usr/bin -usr/share/jwhois var/cache/jwhois diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 07a193c..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,6 +0,0 @@ -30_man_typo -40_afrinic -40_nic.or.kr -45_info_section -46_afrinic -47_retval diff --git a/debian/patches/30_man_typo.dpatch b/debian/patches/30_man_typo.dpatch deleted file mode 100644 index 7a8fc13..0000000 --- a/debian/patches/30_man_typo.dpatch +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_man_typo.dpatch.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: A patch - -@DPATCH@ - - - -diff -urN jwhois-4.0/doc/jwhois.1 jwhois-4.0.new/doc/jwhois.1 ---- jwhois-4.0/doc/jwhois.1 2010-03-16 12:18:00.000000000 -0700 -+++ jwhois-4.0.new/doc/jwhois.1 2010-03-16 12:18:23.000000000 -0700 -@@ -1,4 +1,3 @@ --.PU - .TH jwhois 1 "November 2001" GNU - .SH NAME - jwhois \- client for the whois service -@@ -66,7 +65,7 @@ - completely disable both reading and writing to cache. - .TP - .B \-r \-\-rwhois --force the query to use the rwhois protocoll instead of HTTP or whois. -+force the query to use the rwhois protocol instead of HTTP or whois. - .TP - .B \-\-rwhois\-display=DISPLAY - asks receiving rwhois servers to display the results in the DISPLAY display -diff -urN jwhois-4.0/doc/sv/jwhois.1 jwhois-4.0.new/doc/sv/jwhois.1 ---- jwhois-4.0/doc/sv/jwhois.1 2005-07-12 09:15:14.000000000 -0700 -+++ jwhois-4.0.new/doc/sv/jwhois.1 2010-03-16 12:18:34.000000000 -0700 -@@ -1,5 +1,4 @@ - .\" Translation of jwhois.1 1.9 --.PU - .TH jwhois 1 "November 2001" GNU - .SH NAME - jwhois \- klient för whois-tjänsten -diff -urN jwhois-4.0/doc/jwhois.info jwhois-4.0.new/doc/jwhois.info ---- jwhois-4.0/doc/jwhois.info 2007-10-17 20:24:23.000000000 +1000 -+++ jwhois-4.0.new/doc/jwhois.info 2007-10-17 20:30:57.000000000 +1000 -@@ -135,7 +135,7 @@ - `-r' - - `--rwhois' -- Force the query to use the rwhois protocoll instead of HTTP or -+ Force the query to use the rwhois protocol instead of HTTP or - whois. - - `--rwhois-display=DISPLAY' -diff -urN jwhois-4.0/doc/jwhois.texi jwhois-4.0.new/doc/jwhois.texi ---- jwhois-4.0/doc/jwhois.texi 2007-02-14 19:30:03.000000000 +1100 -+++ jwhois-4.0.new/doc/jwhois.texi 2007-10-17 20:31:06.000000000 +1000 -@@ -171,7 +171,7 @@ - - @item -r - @item --rwhois --Force the query to use the rwhois protocoll instead of HTTP or whois. -+Force the query to use the rwhois protocol instead of HTTP or whois. - - @item --rwhois-display=DISPLAY - Asks receiving rwhois servers to display the results in the DISPLAY display diff --git a/debian/patches/30_man_typo.patch b/debian/patches/30_man_typo.patch new file mode 100644 index 0000000..9d65300 --- /dev/null +++ b/debian/patches/30_man_typo.patch @@ -0,0 +1,56 @@ +From: <[email protected]> +Subject: Fix manual page + +--- + doc/jwhois.1 | 3 +-- + doc/jwhois.info | 2 +- + doc/jwhois.texi | 2 +- + doc/sv/jwhois.1 | 1 - + 4 files changed, 3 insertions(+), 5 deletions(-) + +--- a/doc/jwhois.1 ++++ b/doc/jwhois.1 +@@ -1,4 +1,3 @@ +-.PU + .TH jwhois 1 "November 2001" GNU + .SH NAME + jwhois \- client for the whois service +@@ -66,7 +65,7 @@ + completely disable both reading and writing to cache. + .TP + .B \-r \-\-rwhois +-force the query to use the rwhois protocoll instead of HTTP or whois. ++force the query to use the rwhois protocol instead of HTTP or whois. + .TP + .B \-\-rwhois\-display=DISPLAY + asks receiving rwhois servers to display the results in the DISPLAY display +--- a/doc/sv/jwhois.1 ++++ b/doc/sv/jwhois.1 +@@ -1,5 +1,4 @@ + .\" Translation of jwhois.1 1.9 +-.PU + .TH jwhois 1 "November 2001" GNU + .SH NAME + jwhois \- klient för whois-tjänsten +--- a/doc/jwhois.info ++++ b/doc/jwhois.info +@@ -134,7 +134,7 @@ + `-r' + + `--rwhois' +- Force the query to use the rwhois protocoll instead of HTTP or ++ Force the query to use the rwhois protocol instead of HTTP or + whois. + + `--rwhois-display=DISPLAY' +--- a/doc/jwhois.texi ++++ b/doc/jwhois.texi +@@ -171,7 +171,7 @@ + + @item -r + @item --rwhois +-Force the query to use the rwhois protocoll instead of HTTP or whois. ++Force the query to use the rwhois protocol instead of HTTP or whois. + + @item --rwhois-display=DISPLAY + Asks receiving rwhois servers to display the results in the DISPLAY display diff --git a/debian/patches/40_afrinic.dpatch b/debian/patches/40_afrinic.dpatch deleted file mode 100644 index 0ee56c1..0000000 --- a/debian/patches/40_afrinic.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_afrinic.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds a range of addresses for afrinic - -@DPATCH@ - -diff -urN jwhois-3.2.3/example/jwhois.conf jwhois-3.2.3.new/example/jwhois.conf ---- jwhois-3.2.3/example/jwhois.conf 2005-07-10 04:18:53.000000000 +1000 -+++ jwhois-3.2.3.new/example/jwhois.conf 2005-10-26 16:19:58.000000000 +1000 -@@ -420,6 +420,7 @@ - "62.135.36.0/17" = "whois.afrinic.net"; - "62.0.0.0/8" = "whois.ripe.net"; - "80.87.64.0/19" = "whois.afrinic.net"; -+ "80.248.64.0/20" = "whois.afrinic.net"; - "80.0.0.0/8" = "whois.ripe.net"; - "81.91.224.0/20" = "whois.afrinic.net"; - "81.192.0.0/16" = "whois.afrinic.net"; diff --git a/debian/patches/40_afrinic.patch b/debian/patches/40_afrinic.patch new file mode 100644 index 0000000..5a2687d --- /dev/null +++ b/debian/patches/40_afrinic.patch @@ -0,0 +1,18 @@ +From: <[email protected]> +Subject: Adds a range of addresses for afrinic + + +--- + example/jwhois.conf | 1 + + 1 file changed, 1 insertion(+) + +--- a/example/jwhois.conf ++++ b/example/jwhois.conf +@@ -408,6 +408,7 @@ + "62.135.36.0/17" = "whois.afrinic.net"; + "62.0.0.0/8" = "whois.ripe.net"; + "80.87.64.0/19" = "whois.afrinic.net"; ++ "80.248.64.0/20" = "whois.afrinic.net"; + "80.0.0.0/8" = "whois.ripe.net"; + "81.91.224.0/20" = "whois.afrinic.net"; + "81.192.0.0/16" = "whois.afrinic.net"; diff --git a/debian/patches/40_nic.or.kr.dpatch b/debian/patches/40_nic.or.kr.dpatch deleted file mode 100644 index 1fa1e1b..0000000 --- a/debian/patches/40_nic.or.kr.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_nic.or.kr.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: adds a range of addresses for nic.or.kr - -@DPATCH@ - -diff -urN jwhois-3.2.3/example/jwhois.conf jwhois-3.2.3.new/example/jwhois.conf ---- jwhois-3.2.3/example/jwhois.conf 2005-07-10 04:18:53.000000000 +1000 -+++ jwhois-3.2.3.new/example/jwhois.conf 2005-10-26 16:18:46.000000000 +1000 -@@ -413,6 +413,7 @@ - "24.132.0.0/16" = "whois.ripe.net"; - "24.232.0.0/16" = "whois.lacnic.net"; - "43.0.0.0/8" = "whois.v6nic.net"; -+ "58.140.0.0/14" = "whois.nic.or.kr"; - "58.0.0.0/8" = "whois.apnic.net"; - "59.0.0.0/8" = "whois.apnic.net"; - "60.0.0.0/8" = "whois.apnic.net"; diff --git a/debian/patches/40_nic.or.kr.patch b/debian/patches/40_nic.or.kr.patch new file mode 100644 index 0000000..d3101be --- /dev/null +++ b/debian/patches/40_nic.or.kr.patch @@ -0,0 +1,18 @@ +From: <[email protected]> +Subject: adds a range of addresses for nic.or.kr + + +--- + example/jwhois.conf | 1 + + 1 file changed, 1 insertion(+) + +--- a/example/jwhois.conf ++++ b/example/jwhois.conf +@@ -401,6 +401,7 @@ + "24.232.0.0/16" = "whois.lacnic.net"; + "41.0.0.0/8" = "whois.afrinic.net"; + "43.0.0.0/8" = "whois.v6nic.net"; ++ "58.140.0.0/14" = "whois.nic.or.kr"; + "58.0.0.0/8" = "whois.apnic.net"; + "59.0.0.0/8" = "whois.apnic.net"; + "60.0.0.0/8" = "whois.apnic.net"; diff --git a/debian/patches/45_info_section.dpatch b/debian/patches/45_info_section.dpatch deleted file mode 100644 index 4a43408..0000000 --- a/debian/patches/45_info_section.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 45_info_section.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds INFO-DIR-SECTION to jwhois.info file - -@DPATCH@ - -diff -urN jwhois-3.2.3/doc/jwhois.info jwhois-3.2.3.new/doc/jwhois.info ---- jwhois-3.2.3/doc/jwhois.info 2005-07-10 22:18:56.000000000 +1000 -+++ jwhois-3.2.3.new/doc/jwhois.info 2005-10-27 13:05:18.000000000 +1000 -@@ -1,5 +1,6 @@ - Detta är jwhois.info, skapad av makeinfo version 4.7 från jwhois.texi. - -+INFO-DIR-SECTION Network Applications - START-INFO-DIR-ENTRY - * jwhois: (jwhois). Whois client. - END-INFO-DIR-ENTRY diff --git a/debian/patches/45_info_section.patch b/debian/patches/45_info_section.patch new file mode 100644 index 0000000..6a73ae6 --- /dev/null +++ b/debian/patches/45_info_section.patch @@ -0,0 +1,17 @@ +From: <[email protected]> +Subject: Adds INFO-DIR-SECTION to jwhois.info file + + +--- + doc/jwhois.info | 1 + + 1 file changed, 1 insertion(+) + +--- a/doc/jwhois.info ++++ b/doc/jwhois.info +@@ -1,5 +1,6 @@ + This is jwhois.info, produced by makeinfo version 4.8 from jwhois.texi. + ++INFO-DIR-SECTION Network Applications + START-INFO-DIR-ENTRY + * jwhois: (jwhois). Whois client. + END-INFO-DIR-ENTRY diff --git a/debian/patches/46_afrinic.dpatch b/debian/patches/46_afrinic.dpatch deleted file mode 100644 index f56ea7c..0000000 --- a/debian/patches/46_afrinic.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 46_afrinic.dpatch.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds a range of addresses for afrinic - -@DPATCH@ - -diff -urN jwhois-3.2.3/example/jwhois.conf jwhois-3.2.3.new/example/jwhois.conf ---- jwhois-3.2.3/example/jwhois.conf 2005-10-27 13:10:39.000000000 +1000 -+++ jwhois-3.2.3.new/example/jwhois.conf 2005-11-16 09:57:55.000000000 +1100 -@@ -418,6 +418,7 @@ - "59.0.0.0/8" = "whois.apnic.net"; - "60.0.0.0/8" = "whois.apnic.net"; - "61.0.0.0/8" = "whois.apnic.net"; -+ "62.114.0.0/16" = "whois.afrinic.net"; - "62.135.36.0/17" = "whois.afrinic.net"; - "62.0.0.0/8" = "whois.ripe.net"; - "80.87.64.0/19" = "whois.afrinic.net"; diff --git a/debian/patches/46_afrinic.patch b/debian/patches/46_afrinic.patch new file mode 100644 index 0000000..3ba68b9 --- /dev/null +++ b/debian/patches/46_afrinic.patch @@ -0,0 +1,18 @@ +From: <[email protected]> +Subject: Adds a range of addresses for afrinic + + +--- + example/jwhois.conf | 1 + + 1 file changed, 1 insertion(+) + +--- a/example/jwhois.conf ++++ b/example/jwhois.conf +@@ -406,6 +406,7 @@ + "59.0.0.0/8" = "whois.apnic.net"; + "60.0.0.0/8" = "whois.apnic.net"; + "61.0.0.0/8" = "whois.apnic.net"; ++ "62.114.0.0/16" = "whois.afrinic.net"; + "62.135.36.0/17" = "whois.afrinic.net"; + "62.0.0.0/8" = "whois.ripe.net"; + "80.87.64.0/19" = "whois.afrinic.net"; diff --git a/debian/patches/47_retval.dpatch b/debian/patches/47_retval.patch similarity index 65% rename from debian/patches/47_retval.dpatch rename to debian/patches/47_retval.patch index 3db5994..5075e81 100644 --- a/debian/patches/47_retval.dpatch +++ b/debian/patches/47_retval.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 47_retval.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds a range of addresses for afrinic +From: <[email protected]> +Subject: Adds a range of addresses for afrinic -@DPATCH@ diff -urN jwhois-4.0/src/utils.c jwhois-4.0.new/src/utils.c diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7e737d9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +30_man_typo.patch +40_afrinic.patch +40_nic.or.kr.patch +45_info_section.patch +46_afrinic.patch +47_retval.patch diff --git a/debian/rules b/debian/rules index 936b2bd..9880cea 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ else CFLAGS += -O2 endif -config.status: patch configure +config.status: configure dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub @@ -28,6 +28,10 @@ endif CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --datadir=\$${prefix}/share --with-cache --localstatedir=/var/cache/jwhois + +build-arch: build +build-indep: build + build: build-stamp build-stamp: config.status @@ -35,8 +39,7 @@ build-stamp: config.status $(MAKE) touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -82,13 +85,4 @@ binary-arch: build install binary: binary-indep binary-arch -patch: patch-stamp - -patch-stamp: - dpatch apply-all - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - .PHONY: build clean binary-indep binary-arch binary install 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.9.1
