Package: python-pcs
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 8543ec82a3f9ff2bafc0231fe886bc6bfcc423ed Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 19:43:57 +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 | 18 ++++++++++++++++++
debian/compat | 2 +-
debian/control | 9 +++++----
debian/copyright | 5 +++--
debian/patches/00list | 2 --
...0_import_pypcap.dpatch => 10-import-pypcap.patch} | 8 ++------
...0_remove_pypcap.dpatch => 10-remove-pypcap.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 15 +++++++++------
debian/source/format | 1 +
debian/watch | 1 +
11 files changed, 44 insertions(+), 27 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_import_pypcap.dpatch => 10-import-pypcap.patch} (67%)
rename debian/patches/{10_remove_pypcap.dpatch => 10-remove-pypcap.patch} (95%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index c9f6b4f..b0bff0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+python-pcs (0.5+debian-1.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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix dh_pycentral-is-obsolete (Lintian).
+ * Fix build-depends-on-python-dev-with-no-arch-any (Lintian).
+ * Fix binary-arch-rules-but-pkg-is-arch-indep (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix wrong-section-according-to-package-name python (Lintian).
+ * Fix no-homepage-field (Lintian).
+ * Fix debian-watch-file-should-mangle-version (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 19:41:04 +0300
+
python-pcs (0.5+debian-1.1) unstable; urgency=low
* NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490499.
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 e614e7b..b56ba5e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
Source: python-pcs
-Section: net
+Section: python
Priority: extra
Maintainer: Robert S. Edmonds <[email protected]>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), dpatch, texlive-latex-recommended
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), python-all (>= 2.5), python-central (>= 0.5.6), texlive-latex-recommended
+Standards-Version: 3.9.3
XS-Python-Version: all
+Homepage: http://freecode.com/projects/pcs
Package: python-pcs
Architecture: all
-Depends: ${python:Depends}, python-pypcap
+Depends: ${misc:Depends}, ${python:Depends}, python-pypcap
XB-Python-Version: ${python:Versions}
Description: Packet Construction Set for Python
PCS is a set of Python modules and objects that make building network
diff --git a/debian/copyright b/debian/copyright
index dde3b89..3ba80b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,5 +42,6 @@ License:
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-The Debian packaging is (C) 2007, Robert S. Edmonds <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2007, Robert S. Edmonds
+<[email protected]> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d8c4d88..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10_import_pypcap
-10_remove_pypcap
diff --git a/debian/patches/10_import_pypcap.dpatch b/debian/patches/10-import-pypcap.patch
similarity index 67%
rename from debian/patches/10_import_pypcap.dpatch
rename to debian/patches/10-import-pypcap.patch
index e309cab..3a26b7d 100644
--- a/debian/patches/10_import_pypcap.dpatch
+++ b/debian/patches/10-import-pypcap.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_import_pypcap.dpatch by Robert S. Edmonds <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fake the pcs.pcap namespace
+From: Robert S. Edmonds <[email protected]>
+Subject: fake the pcs.pcap namespace
-@DPATCH@
diff -urNad python-pcs-0.5+debian~/pcs/__init__.py python-pcs-0.5+debian/pcs/__init__.py
--- python-pcs-0.5+debian~/pcs/__init__.py 2007-08-08 23:47:52.000000000 -0400
+++ python-pcs-0.5+debian/pcs/__init__.py 2007-08-14 22:12:14.000000000 -0400
diff --git a/debian/patches/10_remove_pypcap.dpatch b/debian/patches/10-remove-pypcap.patch
similarity index 95%
rename from debian/patches/10_remove_pypcap.dpatch
rename to debian/patches/10-remove-pypcap.patch
index 316c0f1..c17dbb6 100644
--- a/debian/patches/10_remove_pypcap.dpatch
+++ b/debian/patches/10-remove-pypcap.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_remove_pypcap.dpatch by Robert S. Edmonds <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove pypcap setup code
+From: Robert S. Edmonds <[email protected]>
+Subject: remove pypcap setup code
-@DPATCH@
diff -urNad python-pcs-0.5+debian~/setup.py python-pcs-0.5+debian/setup.py
--- python-pcs-0.5+debian~/setup.py 2007-08-08 23:47:57.000000000 -0400
+++ python-pcs-0.5+debian/setup.py 2007-08-14 22:09:46.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d9ba66f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-import-pypcap.patch
+10-remove-pypcap.patch
diff --git a/debian/rules b/debian/rules
index 217546b..bf782ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,15 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
PYVERS = $(shell pyversions -r)
PKG = python-pcs
-build: patch-stamp
+
+build-arch: build
+build-indep: build
+
+build:
dh_testdir
for python in $(PYVERS); do $$python setup.py config build; done
mkdir -p docs/tmp
@@ -14,7 +17,7 @@ build: patch-stamp
&& pdflatex --output-directory=tmp pcs.tex \
&& pdflatex --output-directory=tmp pcs.tex
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf build docs/tmp
@@ -23,14 +26,14 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
for python in $(PYVERS); do $$python setup.py install --no-compile --root=debian/$(PKG); done
-binary-indep: build install
binary-arch: build install
+binary-indep: build install
dh_testdir
dh_testroot
- dh_pycentral
+ dh_python2
dh_installchangelogs
dh_installdocs
dh_installexamples
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)
diff --git a/debian/watch b/debian/watch
index c5c530f..6d16c06 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
+opts="dversionmangle=s/$/+debian/" \
http://sf.net/pcs/pcs-(.*)\.tar\.gz
--
1.7.10
