Package: python-socksipy
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 0b726cc5e0d542e68bd2958244a3a89846b42615 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 09:17:33 -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/README.source | 9 ---------
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
debian/patches/series | 2 ++
debian/patches/{setup.py.dpatch => setup.py.patch} | 8 ++------
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 18 insertions(+), 23 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
rename debian/patches/{setup.py.dpatch => setup.py.patch} (74%)
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index d264c73..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,9 +0,0 @@
-This package is using dpatch patch system.
-
-To patch the source:
- * debian/rules patch
-To add a new patch:
- * put it under debian/patches
- * add it to debian/patches/00list
-
-See /usr/share/doc/dpatch/README.source.gz for more information.
diff --git a/debian/changelog b/debian/changelog
index 99111c5..1eb80d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-socksipy (1.0-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.
+
+ -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 09:16:51 -0500
+
python-socksipy (1.0-1) unstable; urgency=low
* Initial release (Closes: #467222)
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 eefbe13..b4cfa8c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ XS-Python-Version: all
Priority: optional
Maintainer: Thomas Bläsing <[email protected]>
Uploaders: Debian Python Modules Team <[email protected]>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.30)
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: python, python-central (>= 0.6)
Homepage: http://socksipy.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-socksipy/trunk
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6b9c2bd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-setup.py
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b16fc8f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+setup.py.patch
+
diff --git a/debian/patches/setup.py.dpatch b/debian/patches/setup.py.patch
similarity index 74%
rename from debian/patches/setup.py.dpatch
rename to debian/patches/setup.py.patch
index aa8bf15..3f97c77 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: setup.py for installing files the right way :)
+From: <[email protected]>
+Subject: setup.py for installing files the right way :)
-@DPATCH@
diff -urNad SocksiPy-1.0~/setup.py SocksiPy-1.0/setup.py
--- SocksiPy-1.0~/setup.py 1970-01-01 01:00:00.000000000 +0100
+++ SocksiPy-1.0/setup.py 2008-10-14 00:30:56.000000000 +0200
diff --git a/debian/rules b/debian/rules
index 5e9dd4c..79a005c 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
rm -rf build
find . -name '*\.pyc' -delete
dh_clean
-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
