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

Bug#664317: marked as done ([PATCH] sprox: Helping to update to packaging format 3.0)

Your message dated Tue, 10 Apr 2012 14:52:23 +0000
with message-id <E1SHcQh-0000Ns-Lt@franck.debian.org>
and subject line Bug#664317: fixed in sprox 0.6.4-3
has caused the Debian Bug report #664317,
regarding [PATCH] sprox: 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.)


-- 
664317: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664317
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: sprox
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 42dd749880de77c6cd17a9319e1b574e8739c15a Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Mon, 27 Feb 2012 02:40:16 -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/do-not-install-tests.dpatch         |   19 -------------------
 debian/patches/do-not-install-tests.patch          |   18 ++++++++++++++++++
 .../{force-init_py.dpatch => force-init_py.patch}  |    8 ++------
 debian/patches/series                              |    2 ++
 debian/rules                                       |    1 -
 debian/source/format                               |    2 +-
 11 files changed, 36 insertions(+), 35 deletions(-)
 delete mode 100644 debian/patches/00dpatch.conf
 delete mode 100644 debian/patches/00list
 delete mode 100644 debian/patches/do-not-install-tests.dpatch
 create mode 100644 debian/patches/do-not-install-tests.patch
 rename debian/patches/{force-init_py.dpatch => force-init_py.patch} (59%)
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 7c188f4..d491a42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sprox (0.6.4-3) unstable; urgency=low
+
+  * QA upload.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+  * Update to Standards-Version to 3.9.3 and debhelper to 9.
+  * Note: some patches were updated with "quilt refresh" to make
+    patches apply cleanly.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Mon, 27 Feb 2012 02:38:50 -0500
+
 sprox (0.6.4-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 da3ab66..6ae06c0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ 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
-Standards-Version: 3.8.2
+Standards-Version: 3.9.3
 Homepage: http://www.sprox.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sprox/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sprox/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 896ba9b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-do-not-install-tests
-force-init_py
diff --git a/debian/patches/do-not-install-tests.dpatch b/debian/patches/do-not-install-tests.dpatch
deleted file mode 100644
index 620956f..0000000
--- a/debian/patches/do-not-install-tests.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## do-not-install-tests.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid installing tests as a top-level "tests" module
-
-@DPATCH@
-diff -urNad trunk~/setup.py trunk/setup.py
---- trunk~/setup.py	2009-06-10 00:07:55.000000000 +0200
-+++ trunk/setup.py	2009-06-25 16:48:50.557817328 +0200
-@@ -15,7 +15,7 @@
-   install_requires=['sqlalchemy>=0.5',
-                     'tw.forms>=0.9.6',
-                     ],
--  packages = find_packages(),
-+  packages = find_packages(exclude=["tests.*", "tests"]),
-   classifiers=[
-         "Development Status :: 4 - Beta",
-         "Intended Audience :: Developers",
diff --git a/debian/patches/do-not-install-tests.patch b/debian/patches/do-not-install-tests.patch
new file mode 100644
index 0000000..e2a821f
--- /dev/null
+++ b/debian/patches/do-not-install-tests.patch
@@ -0,0 +1,18 @@
+From: Stefano Zacchiroli <zack@debian.org>
+Subject: avoid installing tests as a top-level "tests" module
+
+---
+ setup.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/setup.py
++++ b/setup.py
+@@ -15,7 +15,7 @@
+   install_requires=['sqlalchemy>=0.5',
+                     'tw.forms>=0.9.7.2',
+                     ],
+-  packages = find_packages(),
++  packages = find_packages(exclude=["tests.*", "tests"]),
+   classifiers=[
+         "Development Status :: 4 - Beta",
+         "Intended Audience :: Developers",
diff --git a/debian/patches/force-init_py.dpatch b/debian/patches/force-init_py.patch
similarity index 59%
rename from debian/patches/force-init_py.dpatch
rename to debian/patches/force-init_py.patch
index 63c7b7e..5d281e2 100644
--- a/debian/patches/force-init_py.dpatch
+++ b/debian/patches/force-init_py.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## force-init_py.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid removal of apparently useless __init__.py by pysupport
+From: Stefano Zacchiroli <zack@debian.org>
+Subject: avoid removal of apparently useless __init__.py by pysupport
 
-@DPATCH@
 diff -urNad trunk~/sprox/widgets/templates/__init__.py trunk/sprox/widgets/templates/__init__.py
 --- trunk~/sprox/widgets/templates/__init__.py	2008-12-15 01:50:41.000000000 +0100
 +++ trunk/sprox/widgets/templates/__init__.py	2009-07-04 12:41:56.317687405 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eca3aaf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+do-not-install-tests.patch
+force-init_py.patch
diff --git a/debian/rules b/debian/rules
index 59db312..c8997ad 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-sprox
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
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: sprox
Source-Version: 0.6.4-3

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

python-sprox_0.6.4-3_all.deb
  to main/s/sprox/python-sprox_0.6.4-3_all.deb
sprox_0.6.4-3.debian.tar.gz
  to main/s/sprox/sprox_0.6.4-3.debian.tar.gz
sprox_0.6.4-3.dsc
  to main/s/sprox/sprox_0.6.4-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 664317@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 sprox 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: Wed, 28 Mar 2012 20:12:11 +0300
Source: sprox
Binary: python-sprox
Architecture: source all
Version: 0.6.4-3
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Jari Aalto <jari.aalto@cante.net>
Description: 
 python-sprox - Python library to generate web widgets from database schemas
Closes: 664317
Changes: 
 sprox (0.6.4-3) unstable; urgency=low
 .
   * QA upload.
   * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
     (Closes: #664317).
   * Update to Standards-Version to 3.9.3 and debhelper to 9.
   * Note: some patches were updated with "quilt refresh" to make
     patches apply cleanly.
   * Depend only on python, not python-dev (Lintian).
Checksums-Sha1: 
 3026ddba97bd29cc84ea6ed722be9bbeaae62145 1242 sprox_0.6.4-3.dsc
 db23b1eb459f2d11fb36b789546e313e4caa665c 2909 sprox_0.6.4-3.debian.tar.gz
 f083bd77df77960e4cead794970e9e7c7d72411f 37236 python-sprox_0.6.4-3_all.deb
Checksums-Sha256: 
 77c7b3e8b837eb9a5069119caca8f648cdc2bef74db38e38dcdc4792433a32ad 1242 sprox_0.6.4-3.dsc
 f8d6162182900f71b4fa827b32e227f71df4ed344f6eef021767c9cdb2fe3cc4 2909 sprox_0.6.4-3.debian.tar.gz
 88bf4aede92a5db6b0bfbb6d6bb7a0d4903975e1a6a6c79863c49cd2f4376807 37236 python-sprox_0.6.4-3_all.deb
Files: 
 5899de9f4eb6e6bfb58214c456e7b96c 1242 python optional sprox_0.6.4-3.dsc
 db59ab883c32240099b7849dc45cd44b 2909 python optional sprox_0.6.4-3.debian.tar.gz
 2612446cd1ca6943a8ec820b895e73b1 37236 python optional python-sprox_0.6.4-3_all.deb

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

iEYEARECAAYFAk+EOgsACgkQLARVQsm1XayuVgCcCql3d9q9wQ5JQmtJPvo4u/64
TLIAoK9pg6q3JfQ8UhKVGx3MSLV+ezGT
=XiT5
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: