Package: python-twitter
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 1b462f9c04d363e49a7fbd65d152461e262e818e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 09:28:37 -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.aa...@cante.net>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 3 ---
...rrect-05-doc.dpatch => 10_correct-05-doc.patch} | 8 ++------
debian/patches/20_removes-hashbang.dpatch | 18 ------------------
debian/patches/20_removes-hashbang.patch | 14 ++++++++++++++
...atch => 30_removes_hardcoded_interpreter.patch} | 8 ++------
debian/patches/series | 3 +++
debian/python-twitter.debhelper.log | 13 ++++++++++++-
debian/rules | 5 ++---
debian/source/format | 1 +
12 files changed, 47 insertions(+), 40 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_correct-05-doc.dpatch => 10_correct-05-doc.patch} (99%)
delete mode 100644 debian/patches/20_removes-hashbang.dpatch
create mode 100644 debian/patches/20_removes-hashbang.patch
rename debian/patches/{30_removes_hardcoded_interpreter.dpatch => 30_removes_hardcoded_interpreter.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 3f8ca31..938e3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-twitter (0.6-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 <jari.aa...@cante.net> Wed, 29 Feb 2012 09:24:37 -0500
+
python-twitter (0.6-1) unstable; urgency=low
* New upstream release (Closes: #527055)
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 3ef4292..c6d8081 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Mauro Lizaur <ma...@cacavoladora.org>
Uploaders: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
XS-Python-Version: all
-Build-Depends: debhelper (>= 7), python (>= 2.4.4), python-all-dev, dpatch (>= 2.0.30)
+Build-Depends: debhelper (>= 9), python (>= 2.4.4), python-all-dev
Build-Depends-Indep: python-setuptools, python-support (>= 1.0.3)
-Standards-Version: 3.8.2
+Standards-Version: 3.9.3
Homepage: http://code.google.com/p/python-twitter/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-twitter/trunk
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-twitter/trunk/?op=log
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 594bb45..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-#10_correct-05-doc.dpatch
-20_removes-hashbang.dpatch
-30_removes_hardcoded_interpreter.dpatch
diff --git a/debian/patches/10_correct-05-doc.dpatch b/debian/patches/10_correct-05-doc.patch
similarity index 99%
rename from debian/patches/10_correct-05-doc.dpatch
rename to debian/patches/10_correct-05-doc.patch
index 0f2fe8d..5408d92 100644
--- a/debian/patches/10_correct-05-doc.dpatch
+++ b/debian/patches/10_correct-05-doc.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_correct-05-doc.dpatch by Mauro Lizaur <ma...@cacavoladora.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replaces an old documentation (0.4 to 0.5)
+From: Mauro Lizaur <ma...@cacavoladora.org>
+Subject: Replaces an old documentation (0.4 to 0.5)
-@DPATCH@
--- python-twitter-0.5.orig/doc/twitter.html 2009-03-17 05:58:14.000000000 -0300
+++ python-twitter-0.5/doc/twitter.html 2009-03-17 05:59:13.000000000 -0300
diff --git a/debian/patches/20_removes-hashbang.dpatch b/debian/patches/20_removes-hashbang.dpatch
deleted file mode 100644
index a5697e8..0000000
--- a/debian/patches/20_removes-hashbang.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_removes-hashbang.dpatch by Mauro Lizaur <ma...@cacavoladora.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the Lintian error: file-in-usr-lib-site-python
-## DP: Note from the maintainer:
-## DP: Updated to work with the latest version (i.e. 0.6)
-
-@DPATCH@
-
---- python-twitter-0.6-orig/twitter.py 2009-07-11 18:52:18.000000000 -0300
-+++ python-twitter-0.6/twitter.py 2009-07-11 18:52:30.000000000 -0300
-@@ -1,5 +1,3 @@
--#!/usr/bin/python2.4
--#
- # Copyright 2007 Google Inc. All Rights Reserved.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/debian/patches/20_removes-hashbang.patch b/debian/patches/20_removes-hashbang.patch
new file mode 100644
index 0000000..e1e1781
--- /dev/null
+++ b/debian/patches/20_removes-hashbang.patch
@@ -0,0 +1,14 @@
+From: Mauro Lizaur <ma...@cacavoladora.org>
+Subject: Fixes the Lintian error: file-in-usr-lib-site-python
+Note from the maintainer:
+Updated to work with the latest version (i.e. 0.6)
+
+
+--- python-twitter-0.6-orig/twitter.py 2009-07-11 18:52:18.000000000 -0300
++++ python-twitter-0.6/twitter.py 2009-07-11 18:52:30.000000000 -0300
+@@ -1,5 +1,3 @@
+-#!/usr/bin/python2.4
+-#
+ # Copyright 2007 Google Inc. All Rights Reserved.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/debian/patches/30_removes_hardcoded_interpreter.dpatch b/debian/patches/30_removes_hardcoded_interpreter.patch
similarity index 68%
rename from debian/patches/30_removes_hardcoded_interpreter.dpatch
rename to debian/patches/30_removes_hardcoded_interpreter.patch
index 42ec004..18f130e 100644
--- a/debian/patches/30_removes_hardcoded_interpreter.dpatch
+++ b/debian/patches/30_removes_hardcoded_interpreter.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_removes_hardcoded_interpreter.dpatch by Mauro Lizaur <ma...@cacavoladora.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes the hardcoded version of the Python interpreter.
+From: Mauro Lizaur <ma...@cacavoladora.org>
+Subject: Removes the hardcoded version of the Python interpreter.
-@DPATCH@
--- python-twitter-0.6-orig/examples/twitter-to-xhtml.py 2009-07-11 18:52:18.000000000 -0300
+++ python-twitter-0.6/examples/twitter-to-xhtml.py 2009-07-11 18:53:14.000000000 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5103682
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+#10_correct-05-doc.patch
+20_removes-hashbang.patch
+30_removes_hardcoded_interpreter.patch
diff --git a/debian/python-twitter.debhelper.log b/debian/python-twitter.debhelper.log
index 24cd6d7..fb92d42 100644
--- a/debian/python-twitter.debhelper.log
+++ b/debian/python-twitter.debhelper.log
@@ -1 +1,12 @@
-dh_auto_clean
+dh_installdirs
+dh_installdocs
+dh_installchangelogs
+dh_installman
+dh_compress
+dh_fixperms
+dh_pysupport
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
diff --git a/debian/rules b/debian/rules
index 3eb1c06..c6468f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,14 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
PYVERS=$(shell pyversions -r)
d=debian/python-twitter
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
-clean: unpatch
+clean:
dh_testdir
python setup.py clean;
rm -rf build-stamp build
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
