Package: apg
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 e226124902ada2a7bd3d484d385c5ab436164c11 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 10:23:58 -0500
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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 6 ------
..._path.dpatch => 01_index.php_binary_path.patch} | 8 ++------
.../{02_Makefile.dpatch => 02_Makefile.patch} | 8 ++------
...ocs_remove.dpatch => 03_apgd_docs_remove.patch} | 8 ++------
....dpatch => 04_fix-excessive-random-usage.patch} | 9 +++------
...er-337116.dpatch => 05_saltbuffer-337116.patch} | 8 ++------
...prelim-412618.dpatch => 10_prelim-412618.patch} | 10 +++-------
debian/patches/series | 6 ++++++
debian/rules | 9 +++------
12 files changed, 34 insertions(+), 52 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_index.php_binary_path.dpatch => 01_index.php_binary_path.patch} (67%)
rename debian/patches/{02_Makefile.dpatch => 02_Makefile.patch} (82%)
rename debian/patches/{03_apgd_docs_remove.dpatch => 03_apgd_docs_remove.patch} (79%)
rename debian/patches/{04_fix-excessive-random-usage.dpatch => 04_fix-excessive-random-usage.patch} (85%)
rename debian/patches/{05_saltbuffer-337116.dpatch => 05_saltbuffer-337116.patch} (56%)
rename debian/patches/{10_prelim-412618.dpatch => 10_prelim-412618.patch} (73%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 7b729cd..9fde8a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apg (2.2.3.dfsg.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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 10:22:30 -0500
+
apg (2.2.3.dfsg.1-2) unstable; urgency=low
* apply patch from Kaare Hviid to improve password quality on
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 76d6dba..b35d141 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: apg
Section: admin
Priority: optional
Maintainer: Marc Haber <mh+debian-packa...@zugschlus.de>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), dpatch, patchutils
-Standards-Version: 3.7.2.2
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9), patchutils
+Standards-Version: 3.9.3
Package: apg
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5cabbed..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-01_index.php_binary_path
-02_Makefile
-03_apgd_docs_remove
-04_fix-excessive-random-usage
-05_saltbuffer-337116
-10_prelim-412618
\ No newline at end of file
diff --git a/debian/patches/01_index.php_binary_path.dpatch b/debian/patches/01_index.php_binary_path.patch
similarity index 67%
rename from debian/patches/01_index.php_binary_path.dpatch
rename to debian/patches/01_index.php_binary_path.patch
index 23923cc..3ae7983 100644
--- a/debian/patches/01_index.php_binary_path.dpatch
+++ b/debian/patches/01_index.php_binary_path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_index.php_binary_path.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: Fix call path
-@DPATCH@
diff -urNad apg/php/apgonline/index.php /tmp/dpep.Xgzj3Z/apg/php/apgonline/index.php
--- apg/php/apgonline/index.php 2002-09-13 08:10:49.000000000 +0000
+++ /tmp/dpep.Xgzj3Z/apg/php/apgonline/index.php 2004-12-20 12:16:37.000000000 +0000
diff --git a/debian/patches/02_Makefile.dpatch b/debian/patches/02_Makefile.patch
similarity index 82%
rename from debian/patches/02_Makefile.dpatch
rename to debian/patches/02_Makefile.patch
index 7ec45bb..1745342 100644
--- a/debian/patches/02_Makefile.dpatch
+++ b/debian/patches/02_Makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_Makefile.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: Adjust Makefile
-@DPATCH@
diff -urNad ./Makefile /tmp/dpep-work.B8bqpE/trunk/Makefile
--- ./Makefile 2003-08-07 15:40:30.000000000 +0000
+++ /tmp/dpep-work.B8bqpE/trunk/Makefile 2005-02-27 11:36:49.781144504 +0000
diff --git a/debian/patches/03_apgd_docs_remove.dpatch b/debian/patches/03_apgd_docs_remove.patch
similarity index 79%
rename from debian/patches/03_apgd_docs_remove.dpatch
rename to debian/patches/03_apgd_docs_remove.patch
index 8bf4cac..48156d4 100644
--- a/debian/patches/03_apgd_docs_remove.dpatch
+++ b/debian/patches/03_apgd_docs_remove.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_apgd_docs_remove.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: remove apgd from SEE ALSO in man pages, we don't ship apgd (Closes: #319592)
-@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./doc/man/apg.1 /tmp/dpep-work.dFyQOr/apg/doc/man/apg.1
--- ./doc/man/apg.1 2003-08-07 15:40:30.000000000 +0000
+++ /tmp/dpep-work.dFyQOr/apg/doc/man/apg.1 2005-07-23 10:43:48.000000000 +0000
diff --git a/debian/patches/04_fix-excessive-random-usage.dpatch b/debian/patches/04_fix-excessive-random-usage.patch
similarity index 85%
rename from debian/patches/04_fix-excessive-random-usage.dpatch
rename to debian/patches/04_fix-excessive-random-usage.patch
index 890a283..27d5aa8 100644
--- a/debian/patches/04_fix-excessive-random-usage.dpatch
+++ b/debian/patches/04_fix-excessive-random-usage.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix-excessive-random-usage.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: read only as much from /dev/random as actually needed
+ (Closes: #320307). Thanks to Johannes Berg.
-@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./rnd.c /tmp/dpep-work.HP9NDI/apg/rnd.c
--- ./rnd.c 2003-08-07 15:40:30.000000000 +0000
+++ /tmp/dpep-work.HP9NDI/apg/rnd.c 2005-08-09 10:42:38.000000000 +0000
diff --git a/debian/patches/05_saltbuffer-337116.dpatch b/debian/patches/05_saltbuffer-337116.patch
similarity index 56%
rename from debian/patches/05_saltbuffer-337116.dpatch
rename to debian/patches/05_saltbuffer-337116.patch
index 03ab730..b070b7f 100644
--- a/debian/patches/05_saltbuffer-337116.dpatch
+++ b/debian/patches/05_saltbuffer-337116.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_saltbuffer-337116.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix segfaults with -y option, #337116
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: Fix segfaults with -y option, #337116
-@DPATCH@
diff -urNad trunk~/apg.c trunk/apg.c
--- trunk~/apg.c 2003-09-12 17:46:27.000000000 +0000
+++ trunk/apg.c 2006-10-17 10:07:54.000000000 +0000
diff --git a/debian/patches/10_prelim-412618.dpatch b/debian/patches/10_prelim-412618.patch
similarity index 73%
rename from debian/patches/10_prelim-412618.dpatch
rename to debian/patches/10_prelim-412618.patch
index 68225b4..2d137f0 100644
--- a/debian/patches/10_prelim-412618.dpatch
+++ b/debian/patches/10_prelim-412618.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_prelim-412618.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: preliminary patch to improve password quality on 64bit arches.
-## DP: submitted by Kaare Hviid (BTS #412618)
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: preliminary patch to improve password quality on 64bit arches.
+ Submitted by Kaare Hviid (BTS #412618)
-@DPATCH@
diff -urNad trunk~/sha/sha.c trunk/sha/sha.c
--- trunk~/sha/sha.c 2003-08-07 17:40:30.000000000 +0200
+++ trunk/sha/sha.c 2007-06-20 17:06:33.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cfd7202
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+01_index.php_binary_path.patch
+02_Makefile.patch
+03_apgd_docs_remove.patch
+04_fix-excessive-random-usage.patch
+05_saltbuffer-337116.patch
+10_prelim-412618.patch
diff --git a/debian/rules b/debian/rules
index cc7546a..5646278 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,11 @@
# automatic debian/control generation disabled, cdbs bug #311724.
-DEB_MAKE_CLEAN_TARGET := clean
-DEB_MAKE_BUILD_TARGET := standalone
-DEB_MAKE_INSTALL_TARGET := install INSTALL_PREFIX=$(CURDIR)/debian/apg/usr
+DEB_MAKE_CLEAN_TARGET := clean
+DEB_MAKE_BUILD_TARGET := standalone
+DEB_MAKE_INSTALL_TARGET := install INSTALL_PREFIX=$(CURDIR)/debian/apg/usr
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
cleanbuilddir/apg::
@@ -24,5 +23,3 @@ install/apg::
install -D --mode=0755 $(CURDIR)/debian/apg.wrapper $(CURDIR)/debian/apg/usr/bin/apg
install -D --mode=0644 $(CURDIR)/debian/apg.conf $(CURDIR)/debian/apg/etc/apg.conf
-# bug #284231
-unpatch: deapply-dpatches
--
1.7.9
