Bug#664309: [PATCH] tg.devtools: Helping to update to packaging format 3.0
Package: tg.devtools
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 a1b70c7e97504b880d8d35a66c45a0b51c036533 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Mon, 27 Feb 2012 02:50:34 -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.aalto@cante.net>
---
debian/changelog | 10 +++++++++
debian/compat | 2 +-
debian/control | 5 +--
debian/patches/00dpatch.conf | 2 -
debian/patches/00list | 2 -
debian/patches/avoid-catwalk-dep.dpatch | 21 --------------------
debian/patches/avoid-catwalk-dep.patch | 20 +++++++++++++++++++
...e-shebang.dpatch => fix-template-shebang.patch} | 9 +------
...-by-default.dpatch => no-auth-by-default.patch} | 10 ++------
debian/patches/series | 2 +
debian/rules | 1 -
debian/source/format | 2 +-
12 files changed, 41 insertions(+), 45 deletions(-)
delete mode 100644 debian/patches/00dpatch.conf
delete mode 100644 debian/patches/00list
delete mode 100644 debian/patches/avoid-catwalk-dep.dpatch
create mode 100644 debian/patches/avoid-catwalk-dep.patch
rename debian/patches/{fix-template-shebang.dpatch => fix-template-shebang.patch} (61%)
rename debian/patches/{no-auth-by-default.dpatch => no-auth-by-default.patch} (70%)
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 1619ee7..6dd58c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tg.devtools (2.0.2-3) unstable; urgency=low
+
+ * QA upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: some patches were updated with "quilt refresh" to make
+ patches apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aalto@cante.net> Mon, 27 Feb 2012 02:47:10 -0500
+
tg.devtools (2.0.2-2) unstable; urgency=low
* Orphan package.
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 7db6712..a5da7ff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 9),
cdbs,
- dpatch,
python-dev,
python-support,
python-setuptools,
@@ -17,7 +16,7 @@ Build-Depends:
python-zope.sqlalchemy (>= 0.4),
python-sqlalchemy (>= 0.5),
python-repoze.what-plugins
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Homepage: http://www.turbogears.org/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/tg.devtools/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/tg.devtools/trunk/
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 55a31e9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-template-shebang
-avoid-catwalk-dep
diff --git a/debian/patches/avoid-catwalk-dep.dpatch b/debian/patches/avoid-catwalk-dep.dpatch
deleted file mode 100644
index 6a0e073..0000000
--- a/debian/patches/avoid-catwalk-dep.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## avoid-catwalk-dep.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix to avoid declaring a useless dep on Catwalk, if auth
-## DP: support has not been requested on a given project.
-
-@DPATCH@
-diff -urNad trunk~/devtools/templates/turbogears/setup.py_tmpl trunk/devtools/templates/turbogears/setup.py_tmpl
---- trunk~/devtools/templates/turbogears/setup.py_tmpl 2009-03-16 23:57:55.000000000 +0100
-+++ trunk/devtools/templates/turbogears/setup.py_tmpl 2009-06-21 13:26:40.663854382 +0200
-@@ -15,7 +15,9 @@
- #url='',
- install_requires=[
- "TurboGears2 >= 2.0b7",
-+ {{if auth == "sqlalchemy"}}
- "Catwalk >= 2.0.2",
-+ {{endif}}
- "Babel >=0.9.4",
- {{if sqlalchemy}}
- "zope.sqlalchemy >= 0.4 ",
diff --git a/debian/patches/avoid-catwalk-dep.patch b/debian/patches/avoid-catwalk-dep.patch
new file mode 100644
index 0000000..0177a2f
--- /dev/null
+++ b/debian/patches/avoid-catwalk-dep.patch
@@ -0,0 +1,20 @@
+From: Stefano Zacchiroli <zack@debian.org>
+Subject: Fix to avoid declaring a useless dep on Catwalk
+ Only if auth support has not been requested on a given project.
+
+---
+ devtools/templates/turbogears/setup.py_tmpl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/devtools/templates/turbogears/setup.py_tmpl
++++ b/devtools/templates/turbogears/setup.py_tmpl
+@@ -15,7 +15,9 @@
+ #url='',
+ install_requires=[
+ "TurboGears2 >= 2.0b7",
++ {{if auth == "sqlalchemy"}}
+ "Catwalk >= 2.0.2",
++ {{endif}}
+ "Babel >=0.9.4",
+ #can be removed iif use_toscawidgets = False
+ "toscawidgets >= 0.9.7.1",
diff --git a/debian/patches/fix-template-shebang.dpatch b/debian/patches/fix-template-shebang.patch
similarity index 61%
rename from debian/patches/fix-template-shebang.dpatch
rename to debian/patches/fix-template-shebang.patch
index e35b5d9..f0fc196 100644
--- a/debian/patches/fix-template-shebang.dpatch
+++ b/debian/patches/fix-template-shebang.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-template-shebang.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix shebang line in upstream's ez_setup template so that it is
-## an absolute path to a Python interpreter
+From: Stefano Zacchiroli <zack@debian.org>
+Subject: Fix shebang line in upstream's ez_setup template so that it is
-@DPATCH@
diff -urNad trunk~/devtools/templates/turbogears/ez_setup/__init__.py trunk/devtools/templates/turbogears/ez_setup/__init__.py
--- trunk~/devtools/templates/turbogears/ez_setup/__init__.py 2008-11-26 22:33:25.000000000 +0100
+++ trunk/devtools/templates/turbogears/ez_setup/__init__.py 2009-06-04 15:23:57.364765682 +0200
diff --git a/debian/patches/no-auth-by-default.dpatch b/debian/patches/no-auth-by-default.patch
similarity index 70%
rename from debian/patches/no-auth-by-default.dpatch
rename to debian/patches/no-auth-by-default.patch
index 00d92fb..21ce8ea 100644
--- a/debian/patches/no-auth-by-default.dpatch
+++ b/debian/patches/no-auth-by-default.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no-auth-by-default.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change the default of the auth query to "no". If needed, auth
-## DP: support should be explicitly requested at quickstart time.
+From: Stefano Zacchiroli <zack@debian.org>
+Subject: Change the default of the auth query to "no".
+ If needed, auth support should be explicitly requested at quickstart time.
-@DPATCH@
diff -urNad trunk~/devtools/commands/quickstart.py trunk/devtools/commands/quickstart.py
--- trunk~/devtools/commands/quickstart.py 2009-03-05 00:34:07.000000000 +0100
+++ trunk/devtools/commands/quickstart.py 2009-06-21 13:18:32.515854157 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a86bd9c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-template-shebang.patch
+avoid-catwalk-dep.patch
diff --git a/debian/rules b/debian/rules
index 6d02101..6ceb97b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
DEB_PYTHON_SYSTEM = pysupport
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
PKG = python-tg.devtools
TMPLDIR = debian/$(PKG)/usr/lib/python*/site-packages/devtools/templates
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)
--
1.7.9
Reply to: