[Python-modules-commits] r17883 - in packages/tagpy/tags (12 files)
nijel at users.alioth.debian.org
nijel at users.alioth.debian.org
Tue Jul 19 11:23:47 UTC 2011
Date: Tuesday, July 19, 2011 @ 11:23:46
Author: nijel
Revision: 17883
[svn-buildpackage] Tagging tagpy 0.94.8-3
Added:
packages/tagpy/tags/0.94.8-3/
packages/tagpy/tags/0.94.8-3/debian/changelog
(from rev 17882, packages/tagpy/trunk/debian/changelog)
packages/tagpy/tags/0.94.8-3/debian/control
(from rev 17880, packages/tagpy/trunk/debian/control)
packages/tagpy/tags/0.94.8-3/debian/patches/optional-siteconf.patch
(from rev 17877, packages/tagpy/trunk/debian/patches/optional-siteconf.patch)
packages/tagpy/tags/0.94.8-3/debian/patches/remove-distribute-check.patch
(from rev 17875, packages/tagpy/trunk/debian/patches/remove-distribute-check.patch)
packages/tagpy/tags/0.94.8-3/debian/patches/series
(from rev 17875, packages/tagpy/trunk/debian/patches/series)
packages/tagpy/tags/0.94.8-3/debian/rules
(from rev 17881, packages/tagpy/trunk/debian/rules)
Deleted:
packages/tagpy/tags/0.94.8-3/debian/changelog
packages/tagpy/tags/0.94.8-3/debian/control
packages/tagpy/tags/0.94.8-3/debian/patches/optional-siteconf.patch
packages/tagpy/tags/0.94.8-3/debian/patches/series
packages/tagpy/tags/0.94.8-3/debian/rules
Deleted: packages/tagpy/tags/0.94.8-3/debian/changelog
===================================================================
--- packages/tagpy/trunk/debian/changelog 2011-07-18 21:29:11 UTC (rev 17874)
+++ packages/tagpy/tags/0.94.8-3/debian/changelog 2011-07-19 11:23:46 UTC (rev 17883)
@@ -1,154 +0,0 @@
-tagpy (0.94.8-3) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Michal ÄŒihaÅ™ <nijel at debian.org> Sun, 06 Feb 2011 13:06:16 +0100
-
-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/0.94.8-3/debian/changelog (from rev 17882, packages/tagpy/trunk/debian/changelog)
===================================================================
--- packages/tagpy/tags/0.94.8-3/debian/changelog (rev 0)
+++ packages/tagpy/tags/0.94.8-3/debian/changelog 2011-07-19 11:23:46 UTC (rev 17883)
@@ -0,0 +1,158 @@
+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/0.94.8-3/debian/control
===================================================================
--- packages/tagpy/trunk/debian/control 2011-07-18 21:29:11 UTC (rev 17874)
+++ packages/tagpy/tags/0.94.8-3/debian/control 2011-07-19 11:23:46 UTC (rev 17883)
@@ -1,27 +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 (>= 7.0.50),
- python-support (>= 0.5.3),
- python-all-dev (>= 2.3.5-11),
- libtag1-dev,
- libboost-python-dev (>= 1.39.2),
- pkg-config,
- python-setuptools
-Standards-Version: 3.9.1
-XS-Python-Version: all
-Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/tagpy/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/tagpy/trunk/
-Homepage: http://mathema.tician.de/software/tagpy
-
-Package: python-tagpy
-Architecture: any
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-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/0.94.8-3/debian/control (from rev 17880, packages/tagpy/trunk/debian/control)
===================================================================
--- packages/tagpy/tags/0.94.8-3/debian/control (rev 0)
+++ packages/tagpy/tags/0.94.8-3/debian/control 2011-07-19 11:23:46 UTC (rev 17883)
@@ -0,0 +1,25 @@
+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 (>= 7.0.50),
+ python-all-dev (>= 2.6.6-3~),
+ libtag1-dev,
+ libboost-python-dev (>= 1.39.2),
+ pkg-config,
+ python-setuptools
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
+Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/tagpy/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/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.
Deleted: packages/tagpy/tags/0.94.8-3/debian/patches/optional-siteconf.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/optional-siteconf.patch 2011-07-18 21:29:11 UTC (rev 17874)
+++ packages/tagpy/tags/0.94.8-3/debian/patches/optional-siteconf.patch 2011-07-19 11:23:46 UTC (rev 17883)
@@ -1,156 +0,0 @@
-Add option to use different config file than siteconf.py.
-This is needed to properly build for more python versions.
---- a/aksetup_helper.py
-+++ b/aksetup_helper.py
-@@ -5,6 +5,12 @@
- import setuptools
- from setuptools import Extension
-
-+import os
-+try:
-+ DEFAULT_SITECONF = os.environ['SITECONF_NAME']
-+except KeyError:
-+ DEFAULT_SITECONF = 'siteconf.py'
-+
- if 'distribute' not in setuptools.__file__:
- print "-------------------------------------------------------------------------"
- print "Setuptools conflict detected."
-@@ -49,7 +55,7 @@
-
-
- class NumpyExtension(Extension):
-- # nicked from
-+ # nicked from
- # http://mail.python.org/pipermail/distutils-sig/2007-September/008253.html
- # solution by Michael Hoffmann
- def __init__(self, *args, **kwargs):
-@@ -109,7 +115,7 @@
-
- # tools -----------------------------------------------------------------------
- def flatten(list):
-- """For an iterable of sub-iterables, generate each member of each
-+ """For an iterable of sub-iterables, generate each member of each
- sub-iterable in turn, i.e. a flattened version of that super-iterable.
-
- Example: Turn [[a,b,c],[d,e,f]] into [a,b,c,d,e,f].
-@@ -249,7 +255,7 @@
-
-
- class ConfigSchema:
-- def __init__(self, options, conf_file="siteconf.py", conf_dir="."):
-+ def __init__(self, options, conf_file=DEFAULT_SITECONF, conf_dir="."):
- self.optdict = dict((opt.name, opt) for opt in options)
- self.options = options
- self.conf_dir = conf_dir
-@@ -272,9 +278,9 @@
- self.conf_dir = conf_dir
-
- def get_default_config(self):
-- return dict((opt.name, opt.default)
-+ return dict((opt.name, opt.default)
- for opt in self.options)
--
-+
- def read_config_from_pyfile(self, filename):
- result = {}
- filevars = {}
-@@ -322,7 +328,7 @@
- result = self.get_default_config()
-
- import os
--
-+
- confignames = []
- if self.global_conf_file is not None:
- confignames.append(self.global_conf_file)
-@@ -425,13 +431,13 @@
- return result
-
- def value_to_str(self, default):
-- return default
-+ return default
-
- def add_to_configparser(self, parser, default=None):
- default = default_or(default, self.default)
- default_str = self.value_to_str(default)
- parser.add_option(
-- "--" + self.as_option(), dest=self.name,
-+ "--" + self.as_option(), dest=self.name,
- default=default_str,
- metavar=self.metavar(), help=self.get_help(default))
-
-@@ -452,11 +458,11 @@
- action = "store_false"
- else:
- action = "store_true"
--
-+
- parser.add_option(
-- "--" + self.as_option(),
-- dest=self.name,
-- help=self.get_help(default),
-+ "--" + self.as_option(),
-+ dest=self.name,
-+ help=self.get_help(default),
- default=default,
- action=action)
-
-@@ -484,7 +490,7 @@
- class IncludeDir(StringListOption):
- def __init__(self, lib_name, default=None, human_name=None, help=None):
- StringListOption.__init__(self, "%s_INC_DIR" % lib_name, default,
-- help=help or ("Include directories for %s"
-+ help=help or ("Include directories for %s"
- % (human_name or humanize(lib_name))))
-
- class LibraryDir(StringListOption):
-@@ -496,14 +502,14 @@
- class Libraries(StringListOption):
- def __init__(self, lib_name, default=None, human_name=None, help=None):
- StringListOption.__init__(self, "%s_LIBNAME" % lib_name, default,
-- help=help or ("Library names for %s (without lib or .so)"
-+ help=help or ("Library names for %s (without lib or .so)"
- % (human_name or humanize(lib_name))))
-
- class BoostLibraries(Libraries):
- def __init__(self, lib_base_name):
-- Libraries.__init__(self, "BOOST_%s" % lib_base_name.upper(),
-+ Libraries.__init__(self, "BOOST_%s" % lib_base_name.upper(),
- ["boost_%s-${BOOST_COMPILER}-mt" % lib_base_name],
-- help="Library names for Boost C++ %s library (without lib or .so)"
-+ help="Library names for Boost C++ %s library (without lib or .so)"
- % humanize(lib_base_name))
-
- def set_up_shipped_boost_if_requested(conf):
-@@ -567,7 +573,7 @@
- source_files += glob(
- "bpl-subset/bpl_subset/libs/thread/src/pthread/*.cpp")
-
-- return (source_files,
-+ return (source_files,
- {"BOOST_MULTI_INDEX_DISABLE_SERIALIZATION": 1}
- )
- else:
-@@ -578,7 +584,7 @@
- return [
- IncludeDir("BOOST", []),
- LibraryDir("BOOST", []),
-- Option("BOOST_COMPILER", default="gcc43",
-+ Option("BOOST_COMPILER", default="gcc43",
- help="The compiler with which Boost C++ was compiled, e.g. gcc43"),
- ]
-
-@@ -613,10 +619,10 @@
- help="Ignored")
- parser.add_option("--enable-shared", help="Ignored", action="store_false")
- parser.add_option("--disable-static", help="Ignored", action="store_false")
-- parser.add_option("--update-user", help="Update user config file (%s)" % schema.user_conf_file,
-+ parser.add_option("--update-user", help="Update user config file (%s)" % schema.user_conf_file,
- action="store_true")
-- parser.add_option("--update-global",
-- help="Update global config file (%s)" % schema.global_conf_file,
-+ parser.add_option("--update-global",
-+ help="Update global config file (%s)" % schema.global_conf_file,
- action="store_true")
-
- schema.add_to_configparser(parser, schema.read_config())
Copied: packages/tagpy/tags/0.94.8-3/debian/patches/optional-siteconf.patch (from rev 17877, packages/tagpy/trunk/debian/patches/optional-siteconf.patch)
===================================================================
--- packages/tagpy/tags/0.94.8-3/debian/patches/optional-siteconf.patch (rev 0)
+++ packages/tagpy/tags/0.94.8-3/debian/patches/optional-siteconf.patch 2011-07-19 11:23:46 UTC (rev 17883)
@@ -0,0 +1,156 @@
+Add option to use different config file than siteconf.py.
+This is needed to properly build for more python versions.
+--- a/aksetup_helper.py
++++ b/aksetup_helper.py
+@@ -5,6 +5,12 @@
+ import setuptools
+ from setuptools import Extension
+
++import os
++try:
++ DEFAULT_SITECONF = os.environ['SITECONF_NAME']
++except KeyError:
++ DEFAULT_SITECONF = 'siteconf.py'
++
+ def setup(*args, **kwargs):
+ from setuptools import setup
+ import traceback
+@@ -24,7 +30,7 @@
+
+
+ class NumpyExtension(Extension):
+- # nicked from
++ # nicked from
+ # http://mail.python.org/pipermail/distutils-sig/2007-September/008253.html
+ # solution by Michael Hoffmann
+ def __init__(self, *args, **kwargs):
+@@ -84,7 +90,7 @@
+
+ # tools -----------------------------------------------------------------------
+ def flatten(list):
+- """For an iterable of sub-iterables, generate each member of each
++ """For an iterable of sub-iterables, generate each member of each
+ sub-iterable in turn, i.e. a flattened version of that super-iterable.
+
+ Example: Turn [[a,b,c],[d,e,f]] into [a,b,c,d,e,f].
+@@ -224,7 +230,7 @@
+
+
+ class ConfigSchema:
+- def __init__(self, options, conf_file="siteconf.py", conf_dir="."):
++ def __init__(self, options, conf_file=DEFAULT_SITECONF, conf_dir="."):
+ self.optdict = dict((opt.name, opt) for opt in options)
+ self.options = options
+ self.conf_dir = conf_dir
+@@ -247,9 +253,9 @@
+ self.conf_dir = conf_dir
+
+ def get_default_config(self):
+- return dict((opt.name, opt.default)
++ return dict((opt.name, opt.default)
+ for opt in self.options)
+-
++
+ def read_config_from_pyfile(self, filename):
+ result = {}
+ filevars = {}
+@@ -297,7 +303,7 @@
+ result = self.get_default_config()
+
+ import os
+-
++
+ confignames = []
+ if self.global_conf_file is not None:
+ confignames.append(self.global_conf_file)
+@@ -400,13 +406,13 @@
+ return result
+
+ def value_to_str(self, default):
+- return default
++ return default
+
+ def add_to_configparser(self, parser, default=None):
+ default = default_or(default, self.default)
+ default_str = self.value_to_str(default)
+ parser.add_option(
+- "--" + self.as_option(), dest=self.name,
++ "--" + self.as_option(), dest=self.name,
+ default=default_str,
+ metavar=self.metavar(), help=self.get_help(default))
+
+@@ -427,11 +433,11 @@
+ action = "store_false"
+ else:
+ action = "store_true"
+-
++
+ parser.add_option(
+- "--" + self.as_option(),
+- dest=self.name,
+- help=self.get_help(default),
++ "--" + self.as_option(),
++ dest=self.name,
++ help=self.get_help(default),
+ default=default,
+ action=action)
+
+@@ -459,7 +465,7 @@
+ class IncludeDir(StringListOption):
+ def __init__(self, lib_name, default=None, human_name=None, help=None):
+ StringListOption.__init__(self, "%s_INC_DIR" % lib_name, default,
+- help=help or ("Include directories for %s"
++ help=help or ("Include directories for %s"
+ % (human_name or humanize(lib_name))))
+
+ class LibraryDir(StringListOption):
+@@ -471,14 +477,14 @@
+ class Libraries(StringListOption):
+ def __init__(self, lib_name, default=None, human_name=None, help=None):
+ StringListOption.__init__(self, "%s_LIBNAME" % lib_name, default,
+- help=help or ("Library names for %s (without lib or .so)"
++ help=help or ("Library names for %s (without lib or .so)"
+ % (human_name or humanize(lib_name))))
+
+ class BoostLibraries(Libraries):
+ def __init__(self, lib_base_name):
+- Libraries.__init__(self, "BOOST_%s" % lib_base_name.upper(),
++ Libraries.__init__(self, "BOOST_%s" % lib_base_name.upper(),
+ ["boost_%s-${BOOST_COMPILER}-mt" % lib_base_name],
+- help="Library names for Boost C++ %s library (without lib or .so)"
++ help="Library names for Boost C++ %s library (without lib or .so)"
+ % humanize(lib_base_name))
+
+ def set_up_shipped_boost_if_requested(conf):
+@@ -542,7 +548,7 @@
+ source_files += glob(
+ "bpl-subset/bpl_subset/libs/thread/src/pthread/*.cpp")
+
+- return (source_files,
++ return (source_files,
+ {"BOOST_MULTI_INDEX_DISABLE_SERIALIZATION": 1}
+ )
+ else:
+@@ -553,7 +559,7 @@
+ return [
+ IncludeDir("BOOST", []),
+ LibraryDir("BOOST", []),
+- Option("BOOST_COMPILER", default="gcc43",
++ Option("BOOST_COMPILER", default="gcc43",
+ help="The compiler with which Boost C++ was compiled, e.g. gcc43"),
+ ]
+
+@@ -588,10 +594,10 @@
+ help="Ignored")
+ parser.add_option("--enable-shared", help="Ignored", action="store_false")
+ parser.add_option("--disable-static", help="Ignored", action="store_false")
+- parser.add_option("--update-user", help="Update user config file (%s)" % schema.user_conf_file,
++ parser.add_option("--update-user", help="Update user config file (%s)" % schema.user_conf_file,
+ action="store_true")
+- parser.add_option("--update-global",
+- help="Update global config file (%s)" % schema.global_conf_file,
++ parser.add_option("--update-global",
++ help="Update global config file (%s)" % schema.global_conf_file,
+ action="store_true")
+
+ schema.add_to_configparser(parser, schema.read_config())
Copied: packages/tagpy/tags/0.94.8-3/debian/patches/remove-distribute-check.patch (from rev 17875, packages/tagpy/trunk/debian/patches/remove-distribute-check.patch)
===================================================================
--- packages/tagpy/tags/0.94.8-3/debian/patches/remove-distribute-check.patch (rev 0)
+++ packages/tagpy/tags/0.94.8-3/debian/patches/remove-distribute-check.patch 2011-07-19 11:23:46 UTC (rev 17883)
@@ -0,0 +1,35 @@
+Remove silly check for distribute (Closes: #634343).
+--- a/aksetup_helper.py
++++ b/aksetup_helper.py
+@@ -5,31 +5,6 @@
+ import setuptools
+ from setuptools import Extension
+
+-if 'distribute' not in setuptools.__file__:
+- 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 "-------------------------------------------------------------------------"
+-
+- delay = 10
+-
+- from time import sleep
+- import sys
+- while delay:
+- sys.stdout.write("Continuing in %d seconds... \r" % delay)
+- sys.stdout.flush()
+- delay -= 1
+- sleep(1)
+-
+ def setup(*args, **kwargs):
+ from setuptools import setup
+ import traceback
Deleted: packages/tagpy/tags/0.94.8-3/debian/patches/series
===================================================================
--- packages/tagpy/trunk/debian/patches/series 2011-07-18 21:29:11 UTC (rev 17874)
+++ packages/tagpy/tags/0.94.8-3/debian/patches/series 2011-07-19 11:23:46 UTC (rev 17883)
@@ -1 +0,0 @@
-optional-siteconf.patch
Copied: packages/tagpy/tags/0.94.8-3/debian/patches/series (from rev 17875, packages/tagpy/trunk/debian/patches/series)
===================================================================
--- packages/tagpy/tags/0.94.8-3/debian/patches/series (rev 0)
+++ packages/tagpy/tags/0.94.8-3/debian/patches/series 2011-07-19 11:23:46 UTC (rev 17883)
@@ -0,0 +1,2 @@
+remove-distribute-check.patch
+optional-siteconf.patch
Deleted: packages/tagpy/tags/0.94.8-3/debian/rules
===================================================================
--- packages/tagpy/trunk/debian/rules 2011-07-18 21:29:11 UTC (rev 17874)
+++ packages/tagpy/tags/0.94.8-3/debian/rules 2011-07-19 11:23:46 UTC (rev 17883)
@@ -1,52 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PYVERSIONS=$(shell pyversions -v -r)
-
-override_dh_compress:
- dh_compress -X examples
-
-override_dh_auto_configure-%:
- SITECONF_NAME=siteconf$*.py python$* ./configure.py \
- --taglib-inc-dir=`pkg-config --cflags-only-I taglib | sed 's/-I//'` \
- --boost-python-libname=boost_python-py`echo $* | tr -d .`
-
-override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%)
-
-override_dh_auto_build-%:
- SITECONF_NAME=siteconf$*.py python$* setup.py build -b build$*
-
-override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build-%)
-
-override_dh_auto_install-%:
- SITECONF_NAME=siteconf$*.py python$* setup.py build -b build$* install --no-compile --root=debian/python-tagpy
-
-override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install-%)
-
-override_dh_auto_clean:
- rm -rf build siteconf*.py *.pyc
-
-build: build-stamp
-
-build-stamp:
- dh build
- touch $@
-
-clean:
- dh clean
-
-install: build
- dh install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh binary-arch
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Copied: packages/tagpy/tags/0.94.8-3/debian/rules (from rev 17881, packages/tagpy/trunk/debian/rules)
===================================================================
--- packages/tagpy/tags/0.94.8-3/debian/rules (rev 0)
+++ packages/tagpy/tags/0.94.8-3/debian/rules 2011-07-19 11:23:46 UTC (rev 17883)
@@ -0,0 +1,54 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+PYVERSIONS=$(shell pyversions -v -r)
+
+override_dh_compress:
+ dh_compress -X examples
+
+override_dh_auto_configure-%:
+ SITECONF_NAME=siteconf$*.py python$* ./configure.py \
+ --taglib-inc-dir=`pkg-config --cflags-only-I taglib | sed 's/-I//'` \
+ --boost-python-libname=boost_python-py`echo $* | tr -d .`
+
+override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%)
+
+override_dh_auto_build-%:
+ SITECONF_NAME=siteconf$*.py python$* setup.py build -b build$*
+
+override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build-%)
+
+override_dh_auto_install-%:
+ SITECONF_NAME=siteconf$*.py python$* setup.py build -b build$* install --no-compile --root=debian/python-tagpy --install-layout=deb
+
+override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install-%)
+
+override_dh_auto_clean:
+ rm -rf build siteconf*.py *.pyc
+
+build: build-stamp
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
+ dh --with python2 build
+ touch $@
+
+clean:
+ dh --with python2 clean
+
+install: build
+ dh --with python2 install
+
+# Build architecture-independent files here.
+binary-indep: build-indep install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build-arch install
+ dh --with python2 binary-arch
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Python-modules-commits
mailing list