Package: seccure
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 f3ed97ab0116db80d9922dd81833271273fce0b8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 10:16:08 -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 | 2 --
.../{10-man-hyphen.dpatch => 10-man-hyphen.patch} | 10 +++-------
....dpatch => 20-mlockall-failure-non-fatal.patch} | 18 +++++++-----------
debian/patches/series | 2 ++
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 26 insertions(+), 26 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10-man-hyphen.dpatch => 10-man-hyphen.patch} (93%)
rename debian/patches/{20-mlockall-failure-non-fatal.dpatch => 20-mlockall-failure-non-fatal.patch} (66%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 9283306..649aa5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+seccure (0.3-3.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:11:14 -0500
+
seccure (0.3-3) unstable; urgency=low
* Modify the patch added in the last upload to enable gcrypt's secure
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 218ed1c..df4540f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: seccure
Section: utils
Priority: optional
Maintainer: James Westby <jw+deb...@jameswestby.net>
-Build-Depends: debhelper (>= 5), libgcrypt-dev, dpatch, xmltoman
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), libgcrypt-dev, xmltoman
+Standards-Version: 3.9.3
Package: seccure
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 167aa65..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10-man-hyphen
-20-mlockall-failure-non-fatal
diff --git a/debian/patches/10-man-hyphen.dpatch b/debian/patches/10-man-hyphen.patch
similarity index 93%
rename from debian/patches/10-man-hyphen.dpatch
rename to debian/patches/10-man-hyphen.patch
index eb6cc4a..ecc6679 100644
--- a/debian/patches/10-man-hyphen.dpatch
+++ b/debian/patches/10-man-hyphen.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-man-hyphen.dpatch by <jw+deb...@jameswestby.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct the man page to use \- instead of - so that the correct
-## DP: character is used in the output.
+From: <jw+deb...@jameswestby.net>
+Subject: Correct the man page to use - instead of - so that the correct
+ character is used in the output.
-@DPATCH@
diff -urNad seccure-0.3~/seccure.manpage.xml seccure-0.3/seccure.manpage.xml
--- seccure-0.3~/seccure.manpage.xml 2006-08-16 21:13:57.000000000 +0100
+++ seccure-0.3/seccure.manpage.xml 2006-08-31 22:47:20.000000000 +0100
diff --git a/debian/patches/20-mlockall-failure-non-fatal.dpatch b/debian/patches/20-mlockall-failure-non-fatal.patch
similarity index 66%
rename from debian/patches/20-mlockall-failure-non-fatal.dpatch
rename to debian/patches/20-mlockall-failure-non-fatal.patch
index 60820b1..499fa22 100644
--- a/debian/patches/20-mlockall-failure-non-fatal.dpatch
+++ b/debian/patches/20-mlockall-failure-non-fatal.patch
@@ -1,15 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-mlockall-failure-non-fatal.dpatch by <james.wes...@canonical.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes in pam mean that seccure isn't allowed to lock all of
-## DP: the memory that it wants. This patch makes that non-fatal, and
-## DP: tells libgcrypt to initialize secure memory instead of disabling
-## DP: it as seccure provides its own. This patch is a stop-gap from
-## DP: the upstream developer, who is working on a better fix.
-## DP: (Closes: #489835)
+From: <james.wes...@canonical.com>
+Subject: Changes in pam mean that seccure isn't allowed to lock all of
+ the memory that it wants. This patch makes that non-fatal, and
+ tells libgcrypt to initialize secure memory instead of disabling
+ it as seccure provides its own. This patch is a stop-gap from
+ the upstream developer, who is working on a better fix.
+ (Closes: #489835)
-@DPATCH@
diff -urNad seccure-0.3~/seccure.c seccure-0.3/seccure.c
--- seccure-0.3~/seccure.c 2006-08-16 21:13:57.000000000 +0100
+++ seccure-0.3/seccure.c 2008-09-16 14:40:53.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7698a3c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-man-hyphen.patch
+20-mlockall-failure-non-fatal.patch
diff --git a/debian/rules b/debian/rules
index 4147929..e65a35e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -16,7 +15,7 @@ endif
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE) CFLAGS="$(CFLAGS)"
@@ -24,7 +23,7 @@ build-stamp: patch
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
