[Python-modules-commits] r24675 - in packages/tagpy/trunk/debian (4 files)
nijel at users.alioth.debian.org
nijel at users.alioth.debian.org
Thu Jun 6 10:21:38 UTC 2013
Date: Thursday, June 6, 2013 @ 10:21:24
Author: nijel
Revision: 24675
Updated patches.
Modified:
packages/tagpy/trunk/debian/changelog
packages/tagpy/trunk/debian/patches/optional-siteconf.patch
packages/tagpy/trunk/debian/patches/series
Deleted:
packages/tagpy/trunk/debian/patches/remove-distribute-check.patch
Modified: packages/tagpy/trunk/debian/changelog
===================================================================
--- packages/tagpy/trunk/debian/changelog 2013-06-06 10:15:09 UTC (rev 24674)
+++ packages/tagpy/trunk/debian/changelog 2013-06-06 10:21:24 UTC (rev 24675)
@@ -5,6 +5,7 @@
[ Michal ÄŒihaÅ™ ]
* New upstream release.
+ * Updated patches.
-- Michal ÄŒihaÅ™ <nijel at debian.org> Thu, 06 Jun 2013 12:14:55 +0200
Modified: packages/tagpy/trunk/debian/patches/optional-siteconf.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/optional-siteconf.patch 2013-06-06 10:15:09 UTC (rev 24674)
+++ packages/tagpy/trunk/debian/patches/optional-siteconf.patch 2013-06-06 10:21:24 UTC (rev 24675)
@@ -2,10 +2,10 @@
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
+@@ -37,6 +37,12 @@
+ count_down_delay(delay=10)
+
+import os
+try:
+ DEFAULT_SITECONF = os.environ['SITECONF_NAME']
@@ -15,142 +15,12 @@
def setup(*args, **kwargs):
from setuptools import setup
import traceback
-@@ -24,7 +30,7 @@
+@@ -265,7 +271,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())
Deleted: packages/tagpy/trunk/debian/patches/remove-distribute-check.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/remove-distribute-check.patch 2013-06-06 10:15:09 UTC (rev 24674)
+++ packages/tagpy/trunk/debian/patches/remove-distribute-check.patch 2013-06-06 10:21:24 UTC (rev 24675)
@@ -1,35 +0,0 @@
-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
Modified: packages/tagpy/trunk/debian/patches/series
===================================================================
--- packages/tagpy/trunk/debian/patches/series 2013-06-06 10:15:09 UTC (rev 24674)
+++ packages/tagpy/trunk/debian/patches/series 2013-06-06 10:21:24 UTC (rev 24675)
@@ -1,2 +1 @@
-remove-distribute-check.patch
optional-siteconf.patch
More information about the Python-modules-commits
mailing list