Package: ike-scan
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 31bb3ead4c82d4b8909aac689e191a1fd6dc7561 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 27 Feb 2012 03:25:05 -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 | 1 -
..._v2.dpatch => 10disable_aggressive_in_v2.patch} | 12 +++++-------
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
8 files changed, 20 insertions(+), 14 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10disable_aggressive_in_v2.dpatch => 10disable_aggressive_in_v2.patch} (75%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 790e4da..5a1ab98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ike-scan (1.9-4.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> Mon, 27 Feb 2012 03:19:48 -0500
+
ike-scan (1.9-4) unstable; urgency=low
* Regular cleanup duties:
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 e2bf3fd..9169a7c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ike-scan
Section: net
Priority: optional
Maintainer: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
-Build-Depends: debhelper (>> 7), autotools-dev, libssl-dev (>= 0.9.8), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), autotools-dev, libssl-dev (>= 0.9.8)
+Standards-Version: 3.9.3
Package: ike-scan
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4beafa4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10disable_aggressive_in_v2
diff --git a/debian/patches/10disable_aggressive_in_v2.dpatch b/debian/patches/10disable_aggressive_in_v2.patch
similarity index 75%
rename from debian/patches/10disable_aggressive_in_v2.dpatch
rename to debian/patches/10disable_aggressive_in_v2.patch
index 7c4d464..3fa551b 100644
--- a/debian/patches/10disable_aggressive_in_v2.dpatch
+++ b/debian/patches/10disable_aggressive_in_v2.patch
@@ -1,11 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10disable_aggressive_in_v2.dpatch by <he...@pool.math.tu-berlin.de>
-##
-## DP: --ikev2 overrides --aggressive anyway by reusing the
-## DP: .exchange_type member. Sadly, the override works the
-## DP: other way, too. For consistency disallow both.
+From: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de>
+Subject: Disallow combinations of --aggressive and --ikev2
+ Option --ikev2 overrides --aggressive anyway by reusing the
+ .exchange_type member. Sadly, the override works the
+ other way, too. For consistency disallow both.
-@DPATCH@
--- ike-scan-1.9.orig/ike-scan.c 2007-01-14 20:05:42.000000000 +0100
+++ ike-scan-1.9/ike-scan.c 2009-02-26 02:51:34.063234781 +0100
@@ -472,6 +472,8 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0d23e30
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10disable_aggressive_in_v2.patch
diff --git a/debian/rules b/debian/rules
index 0abc2ec..7bd8f49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-include /usr/share/dpatch/dpatch.make
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -17,7 +16,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif
config: config-stamp
-config-stamp: patch
+config-stamp:
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
@@ -34,7 +33,7 @@ build-stamp: config
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp config-stamp config.sub config.guess
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
