[Python-modules-commits] r30934 - in packages/tagpy/tags (9 files)

nijel at users.alioth.debian.org nijel at users.alioth.debian.org
Mon Oct 6 08:53:54 UTC 2014


    Date: Monday, October 6, 2014 @ 08:53:53
  Author: nijel
Revision: 30934

[svn-buildpackage] Tagging tagpy 2013.1-4

Added:
  packages/tagpy/tags/2013.1-4/
  packages/tagpy/tags/2013.1-4/debian/changelog
    (from rev 30933, packages/tagpy/trunk/debian/changelog)
  packages/tagpy/tags/2013.1-4/debian/control
    (from rev 30929, packages/tagpy/trunk/debian/control)
  packages/tagpy/tags/2013.1-4/debian/patches/0001-Work-around-Debian-bug-712596-fixes-4.patch
    (from rev 30932, packages/tagpy/trunk/debian/patches/0001-Work-around-Debian-bug-712596-fixes-4.patch)
  packages/tagpy/tags/2013.1-4/debian/patches/installed-setuptools.patch
    (from rev 30931, packages/tagpy/trunk/debian/patches/installed-setuptools.patch)
  packages/tagpy/tags/2013.1-4/debian/patches/series
    (from rev 30932, packages/tagpy/trunk/debian/patches/series)
Deleted:
  packages/tagpy/tags/2013.1-4/debian/changelog
  packages/tagpy/tags/2013.1-4/debian/control
  packages/tagpy/tags/2013.1-4/debian/patches/series

Deleted: packages/tagpy/tags/2013.1-4/debian/changelog
===================================================================
--- packages/tagpy/trunk/debian/changelog	2014-03-14 10:37:54 UTC (rev 28184)
+++ packages/tagpy/tags/2013.1-4/debian/changelog	2014-10-06 08:53:53 UTC (rev 30934)
@@ -1,200 +0,0 @@
-tagpy (2013.1-4) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-  * Bump standards to 3.9.5.
-  * Adjust Vcs-Svn URL.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 24 Jul 2013 16:03:27 +0200
-
-tagpy (2013.1-3) unstable; urgency=low
-
-  * Build depend on taglib 1.8.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 24 Jul 2013 15:57:30 +0200
-
-tagpy (2013.1-2) unstable; urgency=low
-
-  * Fixed parameters passed to dh.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 10 Jul 2013 12:11:59 +0200
-
-tagpy (2013.1-1) unstable; urgency=low
-
-  [ Jakub Wilk ]
-  * Use canonical URIs for Vcs-* fields.
-
-  [ Michal ÄŒihaÅ™ ]
-  * New upstream release.
-  * Updated patches.
-  * Bump standards to 3.9.4.
-  * Use debhelper 9.
-  * Fixed compilation with taglib 1.8 (Closes: #713707).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 10 Jul 2013 10:59:10 +0200
-
-tagpy (0.94.8-4) unstable; urgency=low
-
-  * Properly clean build files (Closes: #671332).
-  * Use hardened build flags.
-  * Bump standards to 3.9.3..
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 25 Jun 2012 15:28:48 +0200
-
-tagpy (0.94.8-3) unstable; urgency=low
-
-  * Remove silly check for distribute (Closes: #634343).
-  * Bump standards to 3.9.2.
-  * Add build-arch and build-indep targets.
-  * Migrate to dh_python2.
-  * Install package with --install-layout=deb.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 19 Jul 2011 13:19:37 +0200
-
-tagpy (0.94.8-2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 06 Feb 2011 12:59:50 +0100
-
-tagpy (0.94.8-1) experimental; urgency=low
-
-  * New upstream release.
-  * Upload to experimental because of freeze.
-  * Bump standards to 3.9.1.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 03 Sep 2010 15:23:23 +0200
-
-tagpy (0.94.7-2) unstable; urgency=low
-
-  * Bump standards to 3.9.0.
-  * Convert to 3.0 (quilt) source format.
-  * Update debian/copyright not to point to common license BSD, but rather
-    include license text.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 29 Jun 2010 11:05:23 +0200
-
-tagpy (0.94.7-1) unstable; urgency=low
-
-  * New upstream version.
-  * Bump standards to 3.8.3 (no changes needed).
-  * Boost 1.39 changed library name, adjust debian/rules and build depend on
-    this version.
-  * Add debian/README.source.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 28 Aug 2009 14:32:54 +0200
-
-tagpy (0.94.6-1) unstable; urgency=low
-
-  * New upstream version.
-  * Refresh optional-siteconf.patch.
-  * Fix build when upstream has forgotten configure script.
-  * Bump standards to 3.8.2 (no changes needed).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 14 Jul 2009 16:28:44 +0200
-
-tagpy (0.94.5-5) unstable; urgency=low
-
-  * Update build deps to debhelper >= 7.0.50 for overrides.
-  * Build depend on non versioned boost (Closes: #531121).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 01 Jun 2009 11:48:31 +0200
-
-tagpy (0.94.5-4) unstable; urgency=low
-
-  * Switch to boost 1.37.
-  * Bump standards to 3.8.1 (no changes needed).
-  * Switch from pycentral to pysupport.
-  * Convert debian/rules to dh.
-  * Add patch to simplify handling of build for more python versions.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 18 Mar 2009 15:05:07 +0100
-
-tagpy (0.94.5-3) unstable; urgency=low
-
-  [ Michal ÄŒihaÅ™ ]
-  * Update to standards 3.8.0 (no changes needed).
-  * Update debian/copyright (year, link to GPL).
-
-  [ Sandro Tosi ]
-  * debian/control
-    - switch Vcs-Browser field to viewsvn
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 15 Feb 2009 14:13:14 +0100
-
-tagpy (0.94.5-2) unstable; urgency=low
-
-  * Include examples in binary package.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 31 Jul 2008 11:42:36 +0200
-
-tagpy (0.94.5-1) unstable; urgency=low
-
-  * New upstream version.
-    - Build depend on python-setuptools.
-    - Fix configure params for new version.
-    - This version builds fine with GCC 4.3 (Closes: #483343).
-  * Use new homepage.
-  * Adjust watch file to use PyPi which is now official download site.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 28 May 2008 14:26:08 +0200
-
-tagpy (0.93-5) unstable; urgency=low
-
-  * Reupload as it seems to be easiest way to trigger rebuild on hppa and
-    mipsel.
-  * Move packaging to Python Modules Packaging Team:
-    - Change Vcs fields in debian/control.
-    - Add team to Uploaders.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 20 May 2008 12:18:56 +0200
-
-tagpy (0.93-4) unstable; urgency=low
-
-  * Link module with correct boost library for each Python version.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 21 Apr 2008 09:18:24 +0200
-
-tagpy (0.93-3) unstable; urgency=low
-
-  * Fix watch file to match upstream website changes.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 27 Feb 2008 17:18:05 +0100
-
-tagpy (0.93-2) unstable; urgency=low
-
-  * Update policy to 3.7.3 (no changes needed).
-  * Drop dpatch build dependency, we don't use it anyway.
-  * Adjusted Vcs-* headers to point to trunk.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 26 Feb 2008 11:01:28 +0100
-
-tagpy (0.93-1) unstable; urgency=low
-
-  * New upstream release (Closes: #448309).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 28 Oct 2007 13:11:17 +0900
-
-tagpy (0.92-1) unstable; urgency=low
-
-  * New upstream release, merges our patch.
-    - Drop not needed patches.
-  * Use new Homepage field.
-  * Build for all supported python versions.
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 03 Oct 2007 01:46:20 +0900
-
-tagpy (0.91-2) unstable; urgency=low
-
-  * Add XS-Vcs headers.
-  * Fix build with current boost libraries (Closes: #426865).
-  * Rebuilt package is installable (Closes: #435785).
-  * Fix crash caused by double free in addFrame (Closes: #438556).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 19 Aug 2007 18:43:25 +0200
-
-tagpy (0.91-1) unstable; urgency=low
-
-  * Initial release (Closes: #417372).
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue,  3 Apr 2007 17:17:27 +0200
-

Copied: packages/tagpy/tags/2013.1-4/debian/changelog (from rev 30933, packages/tagpy/trunk/debian/changelog)
===================================================================
--- packages/tagpy/tags/2013.1-4/debian/changelog	                        (rev 0)
+++ packages/tagpy/tags/2013.1-4/debian/changelog	2014-10-06 08:53:53 UTC (rev 30934)
@@ -0,0 +1,202 @@
+tagpy (2013.1-4) unstable; urgency=medium
+
+  * Add missing python-pkg-resources build dependency.
+  * Bump standards to 3.9.6.
+  * Adjust Vcs-Svn URL.
+  * Use system setuptools for building.
+  * Backport upstream patch for crash on non existing file (Closes: #712596).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 06 Oct 2014 10:49:40 +0200
+
+tagpy (2013.1-3) unstable; urgency=low
+
+  * Build depend on taglib 1.8.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 24 Jul 2013 15:57:30 +0200
+
+tagpy (2013.1-2) unstable; urgency=low
+
+  * Fixed parameters passed to dh.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 10 Jul 2013 12:11:59 +0200
+
+tagpy (2013.1-1) unstable; urgency=low
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Michal ÄŒihaÅ™ ]
+  * New upstream release.
+  * Updated patches.
+  * Bump standards to 3.9.4.
+  * Use debhelper 9.
+  * Fixed compilation with taglib 1.8 (Closes: #713707).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 10 Jul 2013 10:59:10 +0200
+
+tagpy (0.94.8-4) unstable; urgency=low
+
+  * Properly clean build files (Closes: #671332).
+  * Use hardened build flags.
+  * Bump standards to 3.9.3..
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 25 Jun 2012 15:28:48 +0200
+
+tagpy (0.94.8-3) unstable; urgency=low
+
+  * Remove silly check for distribute (Closes: #634343).
+  * Bump standards to 3.9.2.
+  * Add build-arch and build-indep targets.
+  * Migrate to dh_python2.
+  * Install package with --install-layout=deb.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 19 Jul 2011 13:19:37 +0200
+
+tagpy (0.94.8-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 06 Feb 2011 12:59:50 +0100
+
+tagpy (0.94.8-1) experimental; urgency=low
+
+  * New upstream release.
+  * Upload to experimental because of freeze.
+  * Bump standards to 3.9.1.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 03 Sep 2010 15:23:23 +0200
+
+tagpy (0.94.7-2) unstable; urgency=low
+
+  * Bump standards to 3.9.0.
+  * Convert to 3.0 (quilt) source format.
+  * Update debian/copyright not to point to common license BSD, but rather
+    include license text.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 29 Jun 2010 11:05:23 +0200
+
+tagpy (0.94.7-1) unstable; urgency=low
+
+  * New upstream version.
+  * Bump standards to 3.8.3 (no changes needed).
+  * Boost 1.39 changed library name, adjust debian/rules and build depend on
+    this version.
+  * Add debian/README.source.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 28 Aug 2009 14:32:54 +0200
+
+tagpy (0.94.6-1) unstable; urgency=low
+
+  * New upstream version.
+  * Refresh optional-siteconf.patch.
+  * Fix build when upstream has forgotten configure script.
+  * Bump standards to 3.8.2 (no changes needed).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 14 Jul 2009 16:28:44 +0200
+
+tagpy (0.94.5-5) unstable; urgency=low
+
+  * Update build deps to debhelper >= 7.0.50 for overrides.
+  * Build depend on non versioned boost (Closes: #531121).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 01 Jun 2009 11:48:31 +0200
+
+tagpy (0.94.5-4) unstable; urgency=low
+
+  * Switch to boost 1.37.
+  * Bump standards to 3.8.1 (no changes needed).
+  * Switch from pycentral to pysupport.
+  * Convert debian/rules to dh.
+  * Add patch to simplify handling of build for more python versions.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 18 Mar 2009 15:05:07 +0100
+
+tagpy (0.94.5-3) unstable; urgency=low
+
+  [ Michal ÄŒihaÅ™ ]
+  * Update to standards 3.8.0 (no changes needed).
+  * Update debian/copyright (year, link to GPL).
+
+  [ Sandro Tosi ]
+  * debian/control
+    - switch Vcs-Browser field to viewsvn
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 15 Feb 2009 14:13:14 +0100
+
+tagpy (0.94.5-2) unstable; urgency=low
+
+  * Include examples in binary package.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 31 Jul 2008 11:42:36 +0200
+
+tagpy (0.94.5-1) unstable; urgency=low
+
+  * New upstream version.
+    - Build depend on python-setuptools.
+    - Fix configure params for new version.
+    - This version builds fine with GCC 4.3 (Closes: #483343).
+  * Use new homepage.
+  * Adjust watch file to use PyPi which is now official download site.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 28 May 2008 14:26:08 +0200
+
+tagpy (0.93-5) unstable; urgency=low
+
+  * Reupload as it seems to be easiest way to trigger rebuild on hppa and
+    mipsel.
+  * Move packaging to Python Modules Packaging Team:
+    - Change Vcs fields in debian/control.
+    - Add team to Uploaders.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 20 May 2008 12:18:56 +0200
+
+tagpy (0.93-4) unstable; urgency=low
+
+  * Link module with correct boost library for each Python version.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 21 Apr 2008 09:18:24 +0200
+
+tagpy (0.93-3) unstable; urgency=low
+
+  * Fix watch file to match upstream website changes.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 27 Feb 2008 17:18:05 +0100
+
+tagpy (0.93-2) unstable; urgency=low
+
+  * Update policy to 3.7.3 (no changes needed).
+  * Drop dpatch build dependency, we don't use it anyway.
+  * Adjusted Vcs-* headers to point to trunk.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 26 Feb 2008 11:01:28 +0100
+
+tagpy (0.93-1) unstable; urgency=low
+
+  * New upstream release (Closes: #448309).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 28 Oct 2007 13:11:17 +0900
+
+tagpy (0.92-1) unstable; urgency=low
+
+  * New upstream release, merges our patch.
+    - Drop not needed patches.
+  * Use new Homepage field.
+  * Build for all supported python versions.
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 03 Oct 2007 01:46:20 +0900
+
+tagpy (0.91-2) unstable; urgency=low
+
+  * Add XS-Vcs headers.
+  * Fix build with current boost libraries (Closes: #426865).
+  * Rebuilt package is installable (Closes: #435785).
+  * Fix crash caused by double free in addFrame (Closes: #438556).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 19 Aug 2007 18:43:25 +0200
+
+tagpy (0.91-1) unstable; urgency=low
+
+  * Initial release (Closes: #417372).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue,  3 Apr 2007 17:17:27 +0200
+

Deleted: packages/tagpy/tags/2013.1-4/debian/control
===================================================================
--- packages/tagpy/trunk/debian/control	2014-03-14 10:37:54 UTC (rev 28184)
+++ packages/tagpy/tags/2013.1-4/debian/control	2014-10-06 08:53:53 UTC (rev 30934)
@@ -1,26 +0,0 @@
-Source: tagpy
-Section: python
-Priority: extra
-Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
-Uploaders: Python Modules Packaging Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9),
-    dpkg-dev (>= 1.16.1~),
-    python-all-dev (>= 2.6.6-3~),
-    libtag1-dev (>= 1.8), 
-    libboost-python-dev (>= 1.39.2),
-    pkg-config,
-    python-setuptools
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.5
-Vcs-Svn: svn://anonscm.debian.org/svn/python-modules/packages/tagpy/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/tagpy/trunk/
-Homepage: http://mathema.tician.de/software/tagpy
-
-Package: python-tagpy
-Architecture: any
-Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: Python module for manipulating tags in music files
- Binds Python to Scott Wheeler's TagLib. Makes it easy to read ID3 tags
- from MP3 files, Xiph Comments from Ogg Vorbis and FLAC files, and APE
- tags from MusePack files.

Copied: packages/tagpy/tags/2013.1-4/debian/control (from rev 30929, packages/tagpy/trunk/debian/control)
===================================================================
--- packages/tagpy/tags/2013.1-4/debian/control	                        (rev 0)
+++ packages/tagpy/tags/2013.1-4/debian/control	2014-10-06 08:53:53 UTC (rev 30934)
@@ -0,0 +1,27 @@
+Source: tagpy
+Section: python
+Priority: extra
+Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
+Uploaders: Python Modules Packaging Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 9),
+    dpkg-dev (>= 1.16.1~),
+    python-all-dev (>= 2.6.6-3~),
+    libtag1-dev (>= 1.8), 
+    libboost-python-dev (>= 1.39.2),
+    pkg-config,
+    python-pkg-resources,
+    python-setuptools
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.5
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/tagpy/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/tagpy/trunk/
+Homepage: http://mathema.tician.de/software/tagpy
+
+Package: python-tagpy
+Architecture: any
+Provides: ${python:Provides}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Description: Python module for manipulating tags in music files
+ Binds Python to Scott Wheeler's TagLib. Makes it easy to read ID3 tags
+ from MP3 files, Xiph Comments from Ogg Vorbis and FLAC files, and APE
+ tags from MusePack files.

Copied: packages/tagpy/tags/2013.1-4/debian/patches/0001-Work-around-Debian-bug-712596-fixes-4.patch (from rev 30932, packages/tagpy/trunk/debian/patches/0001-Work-around-Debian-bug-712596-fixes-4.patch)
===================================================================
--- packages/tagpy/tags/2013.1-4/debian/patches/0001-Work-around-Debian-bug-712596-fixes-4.patch	                        (rev 0)
+++ packages/tagpy/tags/2013.1-4/debian/patches/0001-Work-around-Debian-bug-712596-fixes-4.patch	2014-10-06 08:53:53 UTC (rev 30934)
@@ -0,0 +1,26 @@
+From e2fa4e63caad8e81d13bcc3a65e6b927f1a3cf81 Mon Sep 17 00:00:00 2001
+From: Andreas Kloeckner <inform at tiker.net>
+Date: Wed, 10 Jul 2013 08:03:07 -0400
+Subject: [PATCH 1/1] Work around Debian bug 712596, fixes #4
+
+---
+ tagpy/__init__.py  | 22 +++++++++++-----------
+ test/test_tagpy.py | 20 ++++++++++++++++++++
+ 2 files changed, 31 insertions(+), 11 deletions(-)
+ create mode 100644 test/test_tagpy.py
+
+diff --git a/tagpy/__init__.py b/tagpy/__init__.py
+index 2f3da23..2794743 100644
+--- a/tagpy/__init__.py
++++ b/tagpy/__init__.py
+@@ -101,6 +97,10 @@ class FileRef(object):
+             if file:
+                 return file
+ 
++        from os.path import exists
++        if not exists(fileName):
++            raise IOError("File does not exist")
++
+         from os.path import splitext
+         ext = splitext(fileName)[1][1:].lower()
+ 

Copied: packages/tagpy/tags/2013.1-4/debian/patches/installed-setuptools.patch (from rev 30931, packages/tagpy/trunk/debian/patches/installed-setuptools.patch)
===================================================================
--- packages/tagpy/tags/2013.1-4/debian/patches/installed-setuptools.patch	                        (rev 0)
+++ packages/tagpy/tags/2013.1-4/debian/patches/installed-setuptools.patch	2014-10-06 08:53:53 UTC (rev 30934)
@@ -0,0 +1,56 @@
+Subject: Use system installed setuptools
+From: Michal ÄŒihaÅ™ <nijel at debian.org>
+--- a/aksetup_helper.py
++++ b/aksetup_helper.py
+@@ -1,42 +1,7 @@
+ # dealings with ez_setup ------------------------------------------------------
+-import distribute_setup
+-distribute_setup.use_setuptools()
+-
+ import setuptools
+ from setuptools import Extension
+ 
+-def count_down_delay(delay):
+-    from time import sleep
+-    import sys
+-    while delay:
+-        sys.stdout.write("Continuing in %d seconds...   \r" % delay)
+-        sys.stdout.flush()
+-        delay -= 1
+-        sleep(1)
+-    print("")
+-
+-
+-
+-
+-if not hasattr(setuptools, "_distribute"):
+-    print("-------------------------------------------------------------------------")
+-    print("Setuptools conflict detected.")
+-    print("-------------------------------------------------------------------------")
+-    print("When I imported setuptools, I did not get the distribute version of")
+-    print("setuptools, which is troubling--this package really wants to be used")
+-    print("with distribute rather than the old setuptools package. More than likely,")
+-    print("you have both distribute and setuptools installed, which is bad.")
+-    print("")
+-    print("See this page for more information:")
+-    print("http://wiki.tiker.net/DistributeVsSetuptools")
+-    print("-------------------------------------------------------------------------")
+-    print("I will continue after a short while, fingers crossed.")
+-    print("Hit Ctrl-C now if you'd like to think about the situation.")
+-    print("-------------------------------------------------------------------------")
+-
+-    count_down_delay(delay=10)
+-
+-
+ import os
+ try:
+     DEFAULT_SITECONF = os.environ['SITECONF_NAME']
+@@ -788,7 +753,7 @@
+             pkg_warnings.append("version of '%s' is not what this outer package wants"
+                     % package)
+         elif status == "-":
+-            pkg_warnings.append("subpackage '%s' is not initialized" 
++            pkg_warnings.append("subpackage '%s' is not initialized"
+                     % package)
+         elif status == " ":
+             pass

Deleted: packages/tagpy/tags/2013.1-4/debian/patches/series
===================================================================
--- packages/tagpy/trunk/debian/patches/series	2014-03-14 10:37:54 UTC (rev 28184)
+++ packages/tagpy/tags/2013.1-4/debian/patches/series	2014-10-06 08:53:53 UTC (rev 30934)
@@ -1,2 +0,0 @@
-taglib-1.8.patch
-optional-siteconf.patch

Copied: packages/tagpy/tags/2013.1-4/debian/patches/series (from rev 30932, packages/tagpy/trunk/debian/patches/series)
===================================================================
--- packages/tagpy/tags/2013.1-4/debian/patches/series	                        (rev 0)
+++ packages/tagpy/tags/2013.1-4/debian/patches/series	2014-10-06 08:53:53 UTC (rev 30934)
@@ -0,0 +1,4 @@
+0001-Work-around-Debian-bug-712596-fixes-4.patch
+taglib-1.8.patch
+optional-siteconf.patch
+installed-setuptools.patch




More information about the Python-modules-commits mailing list