Package: anubis
Followup-For: Bug #661030
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.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-1-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 98c05a11310c09e92287ff1d5d7ca0798460db11 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 07:26:51 -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 | 4 ----
...{10_manpage-fix.dpatch => 10_manpage-fix.patch} | 8 ++------
...nutls.dpatch => 20_pkg-config-for-gnutls.patch} | 8 ++------
...setjmp.dpatch => 30_guile-include-setjmp.patch} | 8 ++------
...binutils-gold.dpatch => 40_binutils-gold.patch} | 8 ++------
debian/patches/series | 4 ++++
debian/rules | 5 ++---
debian/source/format | 1 +
11 files changed, 26 insertions(+), 34 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_manpage-fix.dpatch => 10_manpage-fix.patch} (62%)
rename debian/patches/{20_pkg-config-for-gnutls.dpatch => 20_pkg-config-for-gnutls.patch} (68%)
rename debian/patches/{30_guile-include-setjmp.dpatch => 30_guile-include-setjmp.patch} (60%)
rename debian/patches/{40_binutils-gold.dpatch => 40_binutils-gold.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 4f4af22..93e2e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+anubis (4.1.1+dfsg1-3.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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 25 Feb 2012 07:16:25 -0500
+
anubis (4.1.1+dfsg1-3.1) unstable; urgency=low
* Non-maintainer upload.
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 0eb2654..02a3e93 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: anubis
Section: net
Priority: optional
Maintainer: Krzysztof Burghardt <krzysz...@burghardt.pl>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libgsasl7-dev, libgnutls-dev, guile-1.8-dev | libguile-dev, libgpgme11-dev, libpcre3-dev, libpam0g-dev | libpam-dev, libwrap0-dev, m4
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), autotools-dev, libgsasl7-dev, libgnutls-dev, guile-1.8-dev | libguile-dev, libgpgme11-dev, libpcre3-dev, libpam0g-dev | libpam-dev, libwrap0-dev, m4
+Standards-Version: 3.9.3
Homepage: http://www.gnu.org/software/anubis/
Package: anubis
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 460cdb7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-10_manpage-fix.dpatch
-20_pkg-config-for-gnutls
-30_guile-include-setjmp
-40_binutils-gold.dpatch
diff --git a/debian/patches/10_manpage-fix.dpatch b/debian/patches/10_manpage-fix.patch
similarity index 62%
rename from debian/patches/10_manpage-fix.dpatch
rename to debian/patches/10_manpage-fix.patch
index 3bc5942..52d1a2a 100644
--- a/debian/patches/10_manpage-fix.dpatch
+++ b/debian/patches/10_manpage-fix.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_manpage-fix.dpatch by Krzysztof Burghardt <krzysz...@burghardt.pl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix lintian warrning manpage-has-bad-whatis-entry.
+From: Krzysztof Burghardt <krzysz...@burghardt.pl>
+Subject: Fix lintian warrning manpage-has-bad-whatis-entry.
-@DPATCH@
diff -urNad anubis_4.1+dfsg1~/doc/anubis.1 anubis_4.1+dfsg1/doc/anubis.1
--- anubis_4.1+dfsg1~/doc/anubis.1 2007-07-29 18:23:23.000000000 +0200
+++ anubis_4.1+dfsg1/doc/anubis.1 2008-02-27 21:07:09.428517448 +0100
diff --git a/debian/patches/20_pkg-config-for-gnutls.dpatch b/debian/patches/20_pkg-config-for-gnutls.patch
similarity index 68%
rename from debian/patches/20_pkg-config-for-gnutls.dpatch
rename to debian/patches/20_pkg-config-for-gnutls.patch
index a925c4c..0593ca5 100644
--- a/debian/patches/20_pkg-config-for-gnutls.dpatch
+++ b/debian/patches/20_pkg-config-for-gnutls.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_pkg-config-for-gnutls.dpatch by Kumar Appaiah <a.ku...@alumni.iitm.ac.in>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use pkg-config instead of libgnutls-config to find gnutls.
+From: Kumar Appaiah <a.ku...@alumni.iitm.ac.in>
+Subject: Use pkg-config instead of libgnutls-config to find gnutls.
-@DPATCH@
diff -urNad anubis-4.1.1+dfsg1~/configure anubis-4.1.1+dfsg1/configure
--- anubis-4.1.1+dfsg1~/configure 2008-12-19 19:30:14.000000000 +0100
+++ anubis-4.1.1+dfsg1/configure 2009-08-20 20:14:35.787571478 +0200
diff --git a/debian/patches/30_guile-include-setjmp.dpatch b/debian/patches/30_guile-include-setjmp.patch
similarity index 60%
rename from debian/patches/30_guile-include-setjmp.dpatch
rename to debian/patches/30_guile-include-setjmp.patch
index fcc4df3..685d6e9 100644
--- a/debian/patches/30_guile-include-setjmp.dpatch
+++ b/debian/patches/30_guile-include-setjmp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_guile-include-setjmp.dpatch by Krzysztof Burghardt <krzysz...@burghardt.pl>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include setjmp.h in guile.c to avoid FTBFS on ia64.
+From: Krzysztof Burghardt <krzysz...@burghardt.pl>
+Subject: Include setjmp.h in guile.c to avoid FTBFS on ia64.
-@DPATCH@
diff -urNad anubis-4.1.1+dfsg1~/src/guile.c anubis-4.1.1+dfsg1/src/guile.c
--- anubis-4.1.1+dfsg1~/src/guile.c 2008-12-16 17:21:54.000000000 +0100
+++ anubis-4.1.1+dfsg1/src/guile.c 2009-09-02 22:52:35.639742893 +0200
diff --git a/debian/patches/40_binutils-gold.dpatch b/debian/patches/40_binutils-gold.patch
similarity index 68%
rename from debian/patches/40_binutils-gold.dpatch
rename to debian/patches/40_binutils-gold.patch
index c1736ca..b87cf30 100644
--- a/debian/patches/40_binutils-gold.dpatch
+++ b/debian/patches/40_binutils-gold.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_binutils-gold.dpatch by Bhavani Shankar <bh...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS with ld --no-add-needed in natty toolchain.
+From: Bhavani Shankar <bh...@ubuntu.com>
+Subject: Fix FTBFS with ld --no-add-needed in natty toolchain.
-@DPATCH@
diff -urNad anubis-4.1.1+dfsg1~/src/Makefile.in anubis-4.1.1+dfsg1/src/Makefile.in
--- anubis-4.1.1+dfsg1~/src/Makefile.in 2008-12-20 00:00:12.000000000 +0530
+++ anubis-4.1.1+dfsg1/src/Makefile.in 2011-02-03 18:55:07.695872244 +0530
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2c6fe6c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+10_manpage-fix.patch
+20_pkg-config-for-gnutls.patch
+30_guile-include-setjmp.patch
+40_binutils-gold.patch
diff --git a/debian/rules b/debian/rules
index 8ef47dd..1e13324 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
#export DH_VERBOSE=1
# Include 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)
@@ -20,7 +19,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
@@ -37,7 +36,7 @@ build-stamp: config.status
$(MAKE)
touch $@
-clean: clean-patched unpatch
+clean: clean-patched
clean-patched:
dh_testdir
dh_testroot
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
