Bug#664395: [PATCH] tacacs+: Helping to update to packaging format 3.0

Package: tacacs+
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 dedfd0b1f11fce60679b173ab0436acb7369cec7 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 29 Feb 2012 10:55:17 -0500
Subject: [PATCH] format-3.0
Organization: Private

Signed-off-by: Jari Aalto <jari.aalto@cante.net>

debian/README.source | 38 --
debian/changelog | 8 ++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 2 -
...ethostbyname.dpatch => fix_gethostbyname.patch} | 8 +
debian/patches/{fix_man.dpatch => fix_man.patch} | 8 +
debian/patches/series | 2 +
debian/rules | 11 ++-
debian/source/format | 1 +
10 files changed, 21 insertions(+), 63 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{fix_gethostbyname.dpatch => fix_gethostbyname.patch} (96%)
rename debian/patches/{fix_man.dpatch => fix_man.patch} (63%)
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 <dancer@debian.org>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index f99526e..ceb7cc1 100644
a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tacacs+ (4.0.4.19-11.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.
+
+ -- Jari Aalto <jari.aalto@cante.net> Wed, 29 Feb 2012 10:45:34 -0500
+
tacacs+ (4.0.4.19-11) unstable; urgency=low
* Correct one lintian error.

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 ddee797..5edd608 100644
a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: tacacs+
Section: net
Priority: extra
Maintainer: Henry-Nicolas Tourneur <henry.nicolas@tourneur.be>
-Build-Depends: debhelper (>= 7), autotools-dev, flex, m4, bison, libwrap0-dev, libpam0g-dev, dpatch
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autotools-dev, flex, m4, bison, libwrap0-dev, libpam0g-dev
+Standards-Version: 3.9.3
Homepage: http://www.shrubbery.net/tac_plus/

Package: tacacs+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a36b809..0000000
a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_man
-fix_gethostbyname
diff --git a/debian/patches/fix_gethostbyname.dpatch b/debian/patches/fix_gethostbyname.patch
similarity index 96%
rename from debian/patches/fix_gethostbyname.dpatch
rename to debian/patches/fix_gethostbyname.patch
index 17da3f1..0d81c14 100644
a/debian/patches/fix_gethostbyname.dpatch
+++ b/debian/patches/fix_gethostbyname.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_gethostbyname.dpatch by <root@>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Henry-Nicolas Tourneur <henry.nicolas@tourneur.be>
+Subject: replace gethostbyname with getaddrinfo (Closes: #582334)

-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tacacs+-4.0.4.19~/maxsess.c tacacs+-4.0.4.19/maxsess.c
tacacs+-4.0.4.19~/maxsess.c 2009-07-28 02:15:10.000000000 +0000
+++ tacacs+-4.0.4.19/maxsess.c 2010-05-23 09:43:06.000000000 +0000
diff --git a/debian/patches/fix_man.dpatch b/debian/patches/fix_man.patch
similarity index 63%
rename from debian/patches/fix_man.dpatch
rename to debian/patches/fix_man.patch
index 5e5792d..aa0895f 100644
a/debian/patches/fix_man.dpatch
+++ b/debian/patches/fix_man.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_man.dpatch by Henry-Nicolas Tourneur <henry.nicolas@tourneur.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Henry-Nicolas Tourneur <henry.nicolas@tourneur.be>
+Subject: Correct date in manual page

-@DPATCH@
diff -urNad tacacs+-4.0.4.19~/regexp.3 tacacs+-4.0.4.19/regexp.3
tacacs+-4.0.4.19~/regexp.3 2009-07-17 17:34:30.000000000 +0000
+++ tacacs+-4.0.4.19/regexp.3 2010-01-31 16:36:14.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3a4682e
/dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix_man.patch
+fix_gethostbyname.patch
diff --git a/debian/rules b/debian/rules
index d004530..00389a9 100755
a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-

-include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -14,14 +13,10 @@ endif



-config.status: patch-stamp configure
+config.status: configure
dh_testdir
-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
./configure $(CROSS) --prefix=/usr --bindir=\$${prefix}/sbin --mandir=\$${prefix}/share/man\
@@ -34,9 +29,9 @@ build-stamp: config.status

touch $@

-clean: unpatch
+clean:
dh_testdir
- rm -f build-stamp
+ rm -f build-stamp config.sub config.guess

[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.sub config.guess users_guide debian/*.log debian/files
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





To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org