Package: winpdb
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 da2a2e3c0a6131297e326a90ecc23aea4f7b4395 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 30 Apr 2012 23:21:09 +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/clean | 1 +
debian/compat | 2 +-
debian/control | 6 ++--
debian/copyright | 4 +--
debian/patches/00dpatch.conf | 2 --
debian/patches/00list | 1 -
...-hint.dpatch => 10-winpdb-debian-wx-hint.patch} | 8 ++----
debian/patches/series | 1 +
debian/rules | 30 ++++----------------
debian/source/format | 2 +-
debian/winpdb.install | 1 +
12 files changed, 30 insertions(+), 40 deletions(-)
create mode 100644 debian/clean
delete mode 100644 debian/patches/00dpatch.conf
delete mode 100644 debian/patches/00list
rename debian/patches/{winpdb-debian-wx-hint.dpatch => 10-winpdb-debian-wx-hint.patch} (78%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 5e098bc..2b858ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+winpdb (1.4.8-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.
+ * Update rules file to use override_* targets and debian/clean file.
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix python-script-but-no-python-dep (Lintian).
+ * Fix menu-icon-missing (Lintian).
+
+ -- Jari Aalto <[email protected]> Mon, 30 Apr 2012 23:18:04 +0300
+
winpdb (1.4.8-1) unstable; urgency=low
* Updating watch file to reflect the new file location.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f7e585b
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+*.1
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 edbd4a5..06a8d6b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: python
Priority: optional
Maintainer: Bernd Zeimetz <[email protected]>
Uploaders: Python Applications Packaging Team <[email protected]>
-Build-Depends: debhelper (>= 7), python, dpatch
+Build-Depends: debhelper (>= 9), python
Build-Depends-Indep: docbook-to-man, lsb-release, python-support (>= 0.6.4)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Homepage: http://www.winpdb.org/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/winpdb/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/winpdb/trunk/
Package: winpdb
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.6)
Recommends: x-terminal-emulator | screen, python-wxversion, python-wxgtk2.8, python-crypto
Description: Platform independent Python debugger
Winpdb supports debugging of threads- and curses based applications,
diff --git a/debian/copyright b/debian/copyright
index 7683f4d..877070b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,6 +31,6 @@ License:
On Debian systems, the complete text of the GNU General Public License,
version 2, can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is (C) 2007, Bernd Zeimetz <[email protected]> and
-is licensed under the GPL 2, see above.
+The Debian packaging is Copyright (C) 2007, Bernd Zeimetz
+<[email protected]> and is licensed under the GPL 2, see above.
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 bcbdaea..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-winpdb-debian-wx-hint
diff --git a/debian/patches/winpdb-debian-wx-hint.dpatch b/debian/patches/10-winpdb-debian-wx-hint.patch
similarity index 78%
rename from debian/patches/winpdb-debian-wx-hint.dpatch
rename to debian/patches/10-winpdb-debian-wx-hint.patch
index 018635e..3640555 100644
--- a/debian/patches/winpdb-debian-wx-hint.dpatch
+++ b/debian/patches/10-winpdb-debian-wx-hint.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## winpdb-debian-wx-hint.dpatch by Bernd Zeimetz <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Bernd Zeimetz <[email protected]>
+Subject: Adjust STR_WXPYTHON_ERROR_MSG
-@DPATCH@
diff -urNad winpdb~/winpdb.py winpdb/winpdb.py
--- winpdb~/winpdb.py 2009-03-29 07:52:37.000000000 +0200
+++ winpdb/winpdb.py 2009-04-19 14:43:16.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..81c766f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-winpdb-debian-wx-hint.patch
diff --git a/debian/rules b/debian/rules
index 74d6780..79722d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,15 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-
PKGNAME := winpdb
-MANPAGES = $(PKGNAME).1
-
-%.1: debian/%.sgml
- docbook-to-man $< > $@
%:
dh $@
-build: build-stamp
-
-build-stamp: $(DPATCH_STAMPFN) $(MANPAGES)
- dh build
- touch $@
+override_dh_installman:
+ docbook-to-man debian/$(PKGNAME).sgml > $(PKGNAME).1
+ dh_installman
-binary-indep: build-stamp
- dh $@ --before dh_pysupport
+override_dh_python2:
install -m 644 $(CURDIR)/artwork/$(PKGNAME)-icon-16.png \
$(CURDIR)/debian/$(PKGNAME)/usr/share/icons/hicolor/16x16/apps/$(PKGNAME).png
install -m 644 $(CURDIR)/artwork/$(PKGNAME)-icon-32.png \
@@ -30,15 +21,6 @@ binary-indep: build-stamp
install -m 644 $(CURDIR)/debian/$(PKGNAME).xpm \
$(CURDIR)/debian/$(PKGNAME)/usr/share/pixmaps/$(PKGNAME).xpm
chmod 755 $(CURDIR)/debian/$(PKGNAME)/usr/lib/python*/*-packages/*.py
- dh $@ --remaining
-
-binary-arch:
- #nothing to do
-binary: binary-indep
-
-clean: clean-patched unpatch
-clean-patched:
- dh clean
- rm -f $(MANPAGES) build-stamp
+ dh_python2
-.PHONY: clean binary unpatch patch clean-patched binary-indep binary-arch
+# End of file
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)
diff --git a/debian/winpdb.install b/debian/winpdb.install
index 45836d9..ff3c606 100644
--- a/debian/winpdb.install
+++ b/debian/winpdb.install
@@ -1 +1,2 @@
debian/winpdb.desktop usr/share/applications/
+debian/winpdb.xpm usr/share/pixmaps/
--
1.7.10
