[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#664309: marked as done ([PATCH] tg.devtools: Helping to update to packaging format 3.0)

Your message dated Fri, 11 May 2012 12:17:40 +0000
with message-id <E1SSomy-0002F2-8m@franck.debian.org>
and subject line Bug#664309: fixed in tg.devtools 2.0.2-3
has caused the Debian Bug report #664309,
regarding [PATCH] tg.devtools: Helping to update to packaging format 3.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
664309: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664309
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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

--- End Message ---
--- Begin Message --- 
Source: tg.devtools
Source-Version: 2.0.2-3

We believe that the bug you reported is fixed in the latest version of
tg.devtools, which is due to be installed in the Debian FTP archive:

python-tg.devtools_2.0.2-3_all.deb
  to main/t/tg.devtools/python-tg.devtools_2.0.2-3_all.deb
tg.devtools_2.0.2-3.debian.tar.gz
  to main/t/tg.devtools/tg.devtools_2.0.2-3.debian.tar.gz
tg.devtools_2.0.2-3.dsc
  to main/t/tg.devtools/tg.devtools_2.0.2-3.dsc



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 664309@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jari Aalto <jari.aalto@cante.net> (supplier of updated tg.devtools package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Fri, 11 May 2012 10:04:03 +0300
Source: tg.devtools
Binary: python-tg.devtools
Architecture: source all
Version: 2.0.2-3
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Jari Aalto <jari.aalto@cante.net>
Description: 
 python-tg.devtools - developer tools for the TurboGears web framework
Closes: 664309
Changes: 
 tg.devtools (2.0.2-3) unstable; urgency=low
 .
   * QA upload.
   * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
     (Closes: #664309). Note: some patches were updated with "quilt
     refresh" to make them apply cleanly.
   * Update to Standards-Version to 3.9.3 and debhelper to 9.
   * Depend only on python, not python-dev (Lintian).
Checksums-Sha1: 
 762b03b2e44f573c178e3688f99d8a7dab7cc2c9 1522 tg.devtools_2.0.2-3.dsc
 394217c849c4eacc8e85e54e406657291f937d9f 3954 tg.devtools_2.0.2-3.debian.tar.gz
 31bd8f9586a9e9a223deb91d980a385c193cf067 116386 python-tg.devtools_2.0.2-3_all.deb
Checksums-Sha256: 
 4f86cc5126258d86a6fe0aa654ab4b8d0a94ce3ceeb94fd08f7b67b1879bdb7c 1522 tg.devtools_2.0.2-3.dsc
 eef4e19d33653d16973787c425acb6349b96b1fccbf30c8f0d692dad3fc78409 3954 tg.devtools_2.0.2-3.debian.tar.gz
 0c4c872b95ec13ea797ccd93548bab5eb4888c44639cb74b6bdd722d6cf0f195 116386 python-tg.devtools_2.0.2-3_all.deb
Files: 
 2436a34d5e227b01cbfdb08bfa4ada23 1522 python optional tg.devtools_2.0.2-3.dsc
 c3b755b930edad3e1876f2aeede8d101 3954 python optional tg.devtools_2.0.2-3.debian.tar.gz
 27fdd9a8bb6a1f6d51fe63ac8d3c9e82 116386 python optional python-tg.devtools_2.0.2-3_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk+tAPMACgkQLARVQsm1XazsRgCggs85jhNHcgOQFf7YN3BP6kMn
8SoAnAss7xhq+ZlQJDLvnceEtT9LVn7E
=BDJ5
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: