Package: pydb
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.
Thanks,
Jari
>From 54268f05e1198117cbe1e7bfe8feef3b1d591415 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 21 Apr 2012 16:55:08 +0300
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 | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 10 +++++-----
debian/copyright | 2 +-
debian/patches/00list | 2 --
...{01_man_hyphens.dpatch => 01-man-hyphens.patch} | 14 +++++---------
.../patches/{02_man_Sp.dpatch => 02-man-Sp.patch} | 10 +++-------
debian/patches/series | 2 ++
debian/rules | 20 ++++++++++++++++----
debian/source/format | 1 +
10 files changed, 46 insertions(+), 29 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_man_hyphens.dpatch => 01-man-hyphens.patch} (89%)
rename debian/patches/{02_man_Sp.dpatch => 02-man-Sp.patch} (62%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f0fd6e2..8a44c4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pydb (1.26-1.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.
+ * Add build-arch and build-indep and correct clean target in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix depends-on-old-emacs (Lintian)
+
+ -- Jari Aalto <[email protected]> Sat, 21 Apr 2012 16:52:06 +0300
+
pydb (1.26-1) unstable; urgency=low
* Acknowledge the NMU by Simon McVittie.
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 220f1aa..7da546a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
Priority: optional
Maintainer: Oleksandr Moskalenko <[email protected]>
Uploaders: Debian Python Modules Team <[email protected]>
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: python-support (>= 1.0)
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pydb/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pydb/trunk/
@@ -12,9 +12,9 @@ Homepage: http://bashdb.sourceforge.net/pydb/
Package: pydb
Architecture: all
-Depends: ${python:Depends}
-Suggests: ddd, emacs22
-Description: An enhanced Python command-line debugger
+Depends: ${misc:Depends}, ${python:Depends}
+Suggests: ddd, emacs23
+Description: enhanced Python command-line debugger
Pydb is a command-line debugger for Python. It is based on the standard
Python debugger pdb, but has a number of added features. Particularly, it is
suitable for use with DDD, a graphical debugger front end.
diff --git a/debian/copyright b/debian/copyright
index 4f1561b..ebf8f4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,4 +29,4 @@ this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
Street, Fifth Floor, Boston, MA 02110-1301 USA.
On Debian systems the full text of the latest General Public License (GPL) can
-be found at /usr/share/common-licenses/GPL
+be found at /usr/share/common-licenses/GPL-2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1abd221..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_man_hyphens.dpatch
-02_man_Sp.dpatch
diff --git a/debian/patches/01_man_hyphens.dpatch b/debian/patches/01-man-hyphens.patch
similarity index 89%
rename from debian/patches/01_man_hyphens.dpatch
rename to debian/patches/01-man-hyphens.patch
index 67d13b9..deeca3b 100644
--- a/debian/patches/01_man_hyphens.dpatch
+++ b/debian/patches/01-man-hyphens.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_man_hyphens.dpatch by Simon McVittie <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use \(hy or \- rather than - in man page
-## DP:
-## DP: As per `lintian-info --tags hyphen-used-as-minus-sign`, explicit is
-## DP: better than implicit.
+From: Simon McVittie <[email protected]>
+Subject: Use (hy or - rather than - in man page
+
+As per `lintian-info --tags hyphen-used-as-minus-sign`, explicit is
+better than implicit.
-@DPATCH@
diff -urNad pydb~/Doc/pydb.1.in pydb/Doc/pydb.1.in
--- pydb~/Doc/pydb.1.in 2008-06-10 02:05:35.000000000 +0100
+++ pydb/Doc/pydb.1.in 2009-08-02 14:24:43.000000000 +0100
diff --git a/debian/patches/02_man_Sp.dpatch b/debian/patches/02-man-Sp.patch
similarity index 62%
rename from debian/patches/02_man_Sp.dpatch
rename to debian/patches/02-man-Sp.patch
index 0364690..eba5e96 100644
--- a/debian/patches/02_man_Sp.dpatch
+++ b/debian/patches/02-man-Sp.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_man_Sp.dpatch by Simon McVittie <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove undefined .Sp macro; whatever it was meant to do, the man page
-## DP: looks fine without it.
+From: Simon McVittie <[email protected]>
+Subject: Remove undefined .Sp macro; whatever it was meant to do, the man page
+ looks fine without it.
-@DPATCH@
diff -urNad pydb~/Doc/pydb.1.in pydb/Doc/pydb.1.in
--- pydb~/Doc/pydb.1.in 2009-08-02 14:22:03.000000000 +0100
+++ pydb/Doc/pydb.1.in 2009-08-02 14:22:09.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..42522b4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-man-hyphens.patch
+02-man-Sp.patch
diff --git a/debian/rules b/debian/rules
index 718cadd..583a8e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,13 @@ endif
CFLAGS="$(OPT_FLAG)"
-include /usr/share/dpatch/dpatch.make
+
+
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
dh_clean
./configure \
@@ -24,11 +27,20 @@ build-stamp: patch
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp config.status config.log
dh_clean
+ rm -f Doc/Makefile \
+ Doc/pydb.1 \
+ Makefile \
+ emacs/Makefile \
+ emacs/elc-stamp \
+ emacs/pydb.elc
+ # test/except.py and test/settrace.py are orginal files. Leave alone
+ rm -f \
+ $$(ls test/*.in | sed 's/.in$$//' | grep -Ev 'except.py|settrace.py')
install: install-stamp
install-stamp: build-stamp
@@ -64,4 +76,4 @@ binary-indep: build install
binary-arch: build install
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary patch unpatch
+.PHONY: build clean binary-indep binary-arch binary
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.5
