Package: wapiti
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 a5b204f356fe3b4d54defe5df34dd907b8aa2a68 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 09:23:52 -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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 4 ----
debian/patches/{lswww.py.dpatch => lswww.py.patch} | 8 ++------
...ove_hashbangs.dpatch => remove_hashbangs.patch} | 8 ++------
debian/patches/series | 4 ++++
debian/patches/{setup.py.dpatch => setup.py.patch} | 8 ++------
.../patches/{wapiti.py.dpatch => wapiti.py.patch} | 8 ++------
debian/rules | 5 ++---
debian/source/format | 1 +
11 files changed, 26 insertions(+), 34 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{lswww.py.dpatch => lswww.py.patch} (73%)
rename debian/patches/{remove_hashbangs.dpatch => remove_hashbangs.patch} (81%)
create mode 100644 debian/patches/series
rename debian/patches/{setup.py.dpatch => setup.py.patch} (70%)
rename debian/patches/{wapiti.py.dpatch => wapiti.py.patch} (76%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f660f07..2a39062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wapiti (1.1.6-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 <[email protected]> Wed, 29 Feb 2012 09:22:52 -0500
+
wapiti (1.1.6-3) unstable; urgency=low
* Closes: #477034
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 e97fe6c..240fd99 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ XS-Python-Version: >= 2.4
Priority: optional
Maintainer: Thomas Bläsing <[email protected]>
Uploaders: Python Applications Packaging Team <[email protected]>
-Build-Depends: python, python-central (>= 0.5), debhelper (>= 5.0.37.1), dpatch (>= 2.0.29)
-Standards-Version: 3.7.3
+Build-Depends: python, python-central (>= 0.5), debhelper (>= 9)
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/python-apps/packages/wapiti
Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/wapiti/trunk/?op=log
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8c1bde8..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-lswww.py
-setup.py
-wapiti.py
-remove_hashbangs
diff --git a/debian/patches/lswww.py.dpatch b/debian/patches/lswww.py.patch
similarity index 73%
rename from debian/patches/lswww.py.dpatch
rename to debian/patches/lswww.py.patch
index bb5e0c7..3584b3e 100644
--- a/debian/patches/lswww.py.dpatch
+++ b/debian/patches/lswww.py.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lswww.py.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fancy output for installing the recommend packages
+From: Thomas Bläsing <[email protected]>
+Subject: fancy output for installing the recommend packages
-@DPATCH@
diff -urNad wapiti-1.1.6~/lswww.py wapiti-1.1.6/lswww.py
--- wapiti-1.1.6~/lswww.py 2007-01-28 17:48:59.000000000 +0000
+++ wapiti-1.1.6/lswww.py 2008-04-28 20:19:09.000000000 +0000
diff --git a/debian/patches/remove_hashbangs.dpatch b/debian/patches/remove_hashbangs.patch
similarity index 81%
rename from debian/patches/remove_hashbangs.dpatch
rename to debian/patches/remove_hashbangs.patch
index e3ff55a..dd12b2e 100644
--- a/debian/patches/remove_hashbangs.dpatch
+++ b/debian/patches/remove_hashbangs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_hashbangs.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove all uneeded hashbangs
+From: Thomas Bläsing <[email protected]>
+Subject: remove all uneeded hashbangs
-@DPATCH@
diff -urNad wapiti-1.1.6~/cookie.py wapiti-1.1.6/cookie.py
--- wapiti-1.1.6~/cookie.py 2006-07-22 11:14:20.000000000 +0000
+++ wapiti-1.1.6/cookie.py 2008-04-28 21:18:43.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..448e997
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+lswww.py.patch
+setup.py.patch
+wapiti.py.patch
+remove_hashbangs.patch
diff --git a/debian/patches/setup.py.dpatch b/debian/patches/setup.py.patch
similarity index 70%
rename from debian/patches/setup.py.dpatch
rename to debian/patches/setup.py.patch
index 7f2b2c7..b5a1fba 100644
--- a/debian/patches/setup.py.dpatch
+++ b/debian/patches/setup.py.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## setup.py.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: file for adding programmers name and so...
+From: Thomas Bläsing <[email protected]>
+Subject: file for adding programmers name and so...
-@DPATCH@
diff -urNad wapiti-1.1.6~/setup.py wapiti-1.1.6/setup.py
--- wapiti-1.1.6~/setup.py 1970-01-01 00:00:00.000000000 +0000
+++ wapiti-1.1.6/setup.py 2008-04-26 12:01:24.000000000 +0000
diff --git a/debian/patches/wapiti.py.dpatch b/debian/patches/wapiti.py.patch
similarity index 76%
rename from debian/patches/wapiti.py.dpatch
rename to debian/patches/wapiti.py.patch
index 2d9910c..6bd52f7 100644
--- a/debian/patches/wapiti.py.dpatch
+++ b/debian/patches/wapiti.py.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## wapiti.py.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Thomas Bläsing <[email protected]>
+Subject: Add search path and fix Usage
-@DPATCH@
diff -urNad wapiti-1.1.6~/wapiti.py wapiti-1.1.6/wapiti.py
--- wapiti-1.1.6~/wapiti.py 2008-04-28 22:16:46.000000000 +0000
+++ wapiti-1.1.6/wapiti.py 2008-04-28 22:18:12.000000000 +0000
diff --git a/debian/rules b/debian/rules
index ef373b5..8bdc0d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,16 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
build:
-clean: unpatch
+clean:
dh_testdir
dh_testroot
dh_clean
rm -rf build/
find . -name "*.pyc" | xargs rm -f
-install: patch
+install:
dh_testdir
dh_testroot
dh_clean -k
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
