Bug#664305: [PATCH] catwalk: Helping to update to packaging format 3.0
Package: catwalk
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 dbb0af118922d1f9037e718143c7c0903aa0c664 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 26 Feb 2012 08:58:07 -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.aalto@cante.net>
---
debian/changelog | 9 +++++++++
debian/compat | 2 +-
debian/control | 5 ++---
debian/patches/00dpatch.conf | 2 --
debian/patches/00list | 1 -
.../{force-init_py.dpatch => force-init_py.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 1 -
debian/source/format | 2 +-
9 files changed, 16 insertions(+), 15 deletions(-)
delete mode 100644 debian/patches/00dpatch.conf
delete mode 100644 debian/patches/00list
rename debian/patches/{force-init_py.dpatch => force-init_py.patch} (72%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 656e184..b625bb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+catwalk (2.0.2-5) unstable; urgency=low
+
+ * QA upload.
+ * 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.aalto@cante.net> Sun, 26 Feb 2012 08:28:17 -0500
+
catwalk (2.0.2-4) unstable; urgency=low
[ Jakub Wilk ]
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 78cb50a..2538494 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ Section: python
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 9),
cdbs,
- dpatch,
python,
python-support,
python-setuptools
-Standards-Version: 3.8.2
+Standards-Version: 3.9.3
Homepage: http://www.catwalk.org/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/catwalk/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/catwalk/trunk/
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index 685acc6..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../tarballs
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 18b0fb2..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-force-init_py
diff --git a/debian/patches/force-init_py.dpatch b/debian/patches/force-init_py.patch
similarity index 72%
rename from debian/patches/force-init_py.dpatch
rename to debian/patches/force-init_py.patch
index fa7b183..e4f79ae 100644
--- a/debian/patches/force-init_py.dpatch
+++ b/debian/patches/force-init_py.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## force-init_py.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid removal of apparently useless __init__.py by pysupport
+From: Stefano Zacchiroli <zack@debian.org>
+Subject: avoid removal of apparently useless __init__.py by pysupport
-@DPATCH@
diff -urNad trunk~/catwalk/static/__init__.py trunk/catwalk/static/__init__.py
--- trunk~/catwalk/static/__init__.py 2008-12-15 01:50:41.000000000 +0100
+++ trunk/catwalk/static/__init__.py 2009-07-04 12:41:56.317687405 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2ce8c0e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+force-init_py.patch
diff --git a/debian/rules b/debian/rules
index f123c8b..d5a0d60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
DEB_PYTHON_SYSTEM = pysupport
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
PKG = python-catwalk
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
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
Reply to: