Package: ippl
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 71f9b209df2cb6c6d62f78b05a95f5cb3bb67e11 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 10:36: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/README.source | 3 ---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 5 ++---
debian/patches/00list | 6 ------
...noportresolve.dpatch => 10-noportresolve.patch} | 8 ++------
.../{20-ippl-conf.dpatch => 20-ippl-conf.patch} | 8 ++------
.../{30-manpage.dpatch => 30-manpage.patch} | 8 ++------
...20933.dpatch => 40-privilege-drop-420933.patch} | 10 ++++------
.../{50-nostrip.dpatch => 50-nostrip.patch} | 8 ++------
...at-security.dpatch => 60-format-security.patch} | 10 +++-------
debian/patches/series | 6 ++++++
debian/rules | 1 -
debian/source/format | 2 +-
14 files changed, 33 insertions(+), 52 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10-noportresolve.dpatch => 10-noportresolve.patch} (98%)
rename debian/patches/{20-ippl-conf.dpatch => 20-ippl-conf.patch} (84%)
rename debian/patches/{30-manpage.dpatch => 30-manpage.patch} (66%)
rename debian/patches/{40-privilege-drop-420933.dpatch => 40-privilege-drop-420933.patch} (95%)
rename debian/patches/{50-nostrip.dpatch => 50-nostrip.patch} (65%)
rename debian/patches/{60-format-security.dpatch => 60-format-security.patch} (75%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 79a41d9..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-this package uses dpatch and cdbs.
-
-See /usr/share/doc/dpatch/README.source.gz for Details.
diff --git a/debian/changelog b/debian/changelog
index d32c0cd..3c90db1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ippl (1.4.14-12.2) 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:34:08 -0500
+
ippl (1.4.14-12.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 d003823..85e893f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: net
Priority: extra
Maintainer: Marc Haber <mh+debian-packa...@zugschlus.de>
Uploaders: RISKO Gergely <ri...@debian.org>
-Build-Depends: cdbs,
- dpatch, debhelper (>= 5), bison, flex
+Build-Depends: cdbs, debhelper (>= 9), bison, flex
Homepage: http://pltplp.net/ippl/
-Standards-Version: 3.9.0
+Standards-Version: 3.9.3
Package: ippl
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c6f0472..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-10-noportresolve
-20-ippl-conf
-30-manpage
-40-privilege-drop-420933
-50-nostrip
-60-format-security
diff --git a/debian/patches/10-noportresolve.dpatch b/debian/patches/10-noportresolve.patch
similarity index 98%
rename from debian/patches/10-noportresolve.dpatch
rename to debian/patches/10-noportresolve.patch
index 0f0fea7..0621f71 100644
--- a/debian/patches/10-noportresolve.dpatch
+++ b/debian/patches/10-noportresolve.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-noportresolve.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: Document portresolve and noportresolve
-@DPATCH@
diff -urNad trunk~/Docs/ippl.conf.man trunk/Docs/ippl.conf.man
--- trunk~/Docs/ippl.conf.man 2000-11-05 22:03:47.000000000 +0000
+++ trunk/Docs/ippl.conf.man 2005-10-02 18:27:03.000000000 +0000
diff --git a/debian/patches/20-ippl-conf.dpatch b/debian/patches/20-ippl-conf.patch
similarity index 84%
rename from debian/patches/20-ippl-conf.dpatch
rename to debian/patches/20-ippl-conf.patch
index 76b8884..73108d3 100644
--- a/debian/patches/20-ippl-conf.dpatch
+++ b/debian/patches/20-ippl-conf.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-ippl-conf.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: Document /proc/pid/task and fix typos
-@DPATCH@
diff -urNad trunk~/ippl.conf trunk/ippl.conf
--- trunk~/ippl.conf 2001-09-29 13:23:19.000000000 +0000
+++ trunk/ippl.conf 2005-10-02 18:24:54.000000000 +0000
diff --git a/debian/patches/30-manpage.dpatch b/debian/patches/30-manpage.patch
similarity index 66%
rename from debian/patches/30-manpage.dpatch
rename to debian/patches/30-manpage.patch
index 1f5ca08..a7b731e 100644
--- a/debian/patches/30-manpage.dpatch
+++ b/debian/patches/30-manpage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-manpage.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 markup.
-@DPATCH@
diff -urNad ./Docs/ippl.conf.man /tmp/dpep-work.IyOfxu/trunk/Docs/ippl.conf.man
--- ./Docs/ippl.conf.man 2000-11-05 22:03:47.000000000 +0000
+++ /tmp/dpep-work.IyOfxu/trunk/Docs/ippl.conf.man 2005-03-19 20:53:38.340875122 +0000
diff --git a/debian/patches/40-privilege-drop-420933.dpatch b/debian/patches/40-privilege-drop-420933.patch
similarity index 95%
rename from debian/patches/40-privilege-drop-420933.dpatch
rename to debian/patches/40-privilege-drop-420933.patch
index 6886232..86a59ff 100644
--- a/debian/patches/40-privilege-drop-420933.dpatch
+++ b/debian/patches/40-privilege-drop-420933.patch
@@ -1,10 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## privilege-drop-420933.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 privilege drop and re-attachment to sockets.
+ This removes the capability to reload the configuration. Patch
+ thanks to Narayanan R S (CloseS: #420933).
-@DPATCH@
diff -urNad trunk~/Source/icmp.c trunk/Source/icmp.c
--- trunk~/Source/icmp.c 2001-09-28 20:47:58.000000000 +0200
+++ trunk/Source/icmp.c 2007-05-20 12:05:24.000000000 +0200
diff --git a/debian/patches/50-nostrip.dpatch b/debian/patches/50-nostrip.patch
similarity index 65%
rename from debian/patches/50-nostrip.dpatch
rename to debian/patches/50-nostrip.patch
index 6b39cac..62598a8 100644
--- a/debian/patches/50-nostrip.dpatch
+++ b/debian/patches/50-nostrip.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-nostrip.dpatch by Marc Haber <mh+debian-packa...@zugschlus.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No not strip binary during installation
+From: Marc Haber <mh+debian-packa...@zugschlus.de>
+Subject: No not strip binary during installation
-@DPATCH@
diff -urNad trunk~/Makefile.in trunk/Makefile.in
--- trunk~/Makefile.in 2000-04-21 21:37:49.000000000 +0200
+++ trunk/Makefile.in 2007-08-11 09:10:23.000000000 +0200
diff --git a/debian/patches/60-format-security.dpatch b/debian/patches/60-format-security.patch
similarity index 75%
rename from debian/patches/60-format-security.dpatch
rename to debian/patches/60-format-security.patch
index bb60473..427d45a 100644
--- a/debian/patches/60-format-security.dpatch
+++ b/debian/patches/60-format-security.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60-format-security.dpatch by gregor herrmann <gre...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add format argument to avoid FTBFS with -Werror=format-security
-## DP: http://bugs.debian.org/643409
+From: gregor herrmann <gre...@debian.org>
+Subject: add format argument to avoid FTBFS with -Werror=format-security
+ http://bugs.debian.org/643409
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ippl-1.4.14~/Source/log.c ippl-1.4.14/Source/log.c
--- ippl-1.4.14~/Source/log.c 2001-09-29 17:48:27.000000000 +0200
+++ ippl-1.4.14/Source/log.c 2011-12-21 17:59:01.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e7bb6d8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+10-noportresolve.patch
+20-ippl-conf.patch
+30-manpage.patch
+40-privilege-drop-420933.patch
+50-nostrip.patch
+60-format-security.patch
diff --git a/debian/rules b/debian/rules
index a17e9ce..c975c41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_DESTDIR = debian/ippl
DEB_MAKE_INSTALL_TARGET = install ROOT=$(DEB_DESTDIR)
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9
