Package: apf
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
As we spoke before, here is the proposed NMU patch.
Please let me know if there is anything that needs adjusting or if it
is ok to upload with these changes.
Thanks,
Jari
>From 63511084c4469f066fb0ca8b867ad587d73a6e3b Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sun, 26 Feb 2012 06:45: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 <[email protected]>
---
debian/changelog | 9 +++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
...c_afclient.1.dpatch => 01_doc_afclient.1.patch} | 8 ++------
....conf.5.dpatch => 02_doc_afclient.conf.5.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 20 ++++++++------------
debian/source/format | 1 +
9 files changed, 27 insertions(+), 29 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_doc_afclient.1.dpatch => 01_doc_afclient.1.patch} (66%)
rename debian/patches/{02_doc_afclient.conf.5.dpatch => 02_doc_afclient.conf.5.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 0704daa..655901f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apf (0.8.4-2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Restore original config.* files and arrange rules to patch them.
+
+ -- Jari Aalto <[email protected]> Sun, 26 Feb 2012 01:15:04 -0500
+
apf (0.8.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 6505b13..0fa8fe0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: apf
Section: net
Priority: optional
Maintainer: Juan A. Diaz <[email protected]>
-Build-Depends: debhelper (>= 5), autotools-dev, libssl-dev, libz-dev, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), autotools-dev, libssl-dev, libz-dev
+Standards-Version: 3.9.3
Homepage: http://www.gray-world.net/pr_af.shtml
Package: apf-server
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0fab6bd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_doc_afclient.1.dpatch
-02_doc_afclient.conf.5.dpatch
diff --git a/debian/patches/01_doc_afclient.1.dpatch b/debian/patches/01_doc_afclient.1.patch
similarity index 66%
rename from debian/patches/01_doc_afclient.1.dpatch
rename to debian/patches/01_doc_afclient.1.patch
index 5905b96..41af304 100644
--- a/debian/patches/01_doc_afclient.1.dpatch
+++ b/debian/patches/01_doc_afclient.1.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_doc_afclient.1.dpatch.dpatch by Juan A. Diaz <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: '-' must be escaped ('\-') to have it interpreted as minus.
+From: Juan A. Diaz <[email protected]>
+Subject: '-' must be escaped ('-') to have it interpreted as minus.
-@DPATCH@
--- apf-0.8.4.orig/doc/afclient.1 2007-10-13 21:43:44.000000000 -0300
+++ apf-0.8.4/doc/afclient.1 2007-10-15 19:02:06.000000000 -0300
diff --git a/debian/patches/02_doc_afclient.conf.5.dpatch b/debian/patches/02_doc_afclient.conf.5.patch
similarity index 68%
rename from debian/patches/02_doc_afclient.conf.5.dpatch
rename to debian/patches/02_doc_afclient.conf.5.patch
index 4ceb8c6..58fb108 100644
--- a/debian/patches/02_doc_afclient.conf.5.dpatch
+++ b/debian/patches/02_doc_afclient.conf.5.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_doc_afclient.conf.5.dpatch.dpatch by Juan A. Diaz <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: '-' must be escaped ('\-') to have it interpreted as minus.
+From: Juan A. Diaz <[email protected]>
+Subject: '-' must be escaped ('-') to have it interpreted as minus.
-@DPATCH@
--- apf-0.8.4.orig/doc/afclient.conf.5 2007-10-13 21:43:44.000000000 -0300
+++ apf-0.8.4/doc/afclient.conf.5 2007-10-15 19:02:23.000000000 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c317e19
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_doc_afclient.1.patch
+02_doc_afclient.conf.5.patch
diff --git a/debian/rules b/debian/rules
index 67bd0ce..1140f9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@
export DH_OPTIONS
# This package uses dpatch
-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)
@@ -24,8 +23,11 @@ else
CFLAGS += -O2
endif
-config.status: patch configure
+config.status: configure
dh_testdir
+ cp config.h.in config.h.in.orig
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -33,25 +35,19 @@ config.status: patch configure
--infodir=\$${prefix}/share/info \
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
build: build-stamp
build-stamp: config.status
+ [ ! -f config.h.in.orig ] || mv config.h.in.orig config.h.in
dh_testdir
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ # Delete generated files so that they don't end up in patch
+ rm -f config.guess config.sub modules/Makefile
-$(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
dh_clean
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
