[Python-modules-commits] r17877 - in packages/tagpy/trunk/debian/patches (1 file)

[nijel at users.alioth.debian.org]

    Date: Tuesday, July 19, 2011 @ 10:03:40
  Author: nijel
Revision: 17877

Update patches

Modified:
  packages/tagpy/trunk/debian/patches/optional-siteconf.patch

Modified: packages/tagpy/trunk/debian/patches/optional-siteconf.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/optional-siteconf.patch	2011-07-19 10:02:23 UTC (rev 17876)
+++ packages/tagpy/trunk/debian/patches/optional-siteconf.patch	2011-07-19 10:03:40 UTC (rev 17877)
@@ -12,10 +12,10 @@
 +except KeyError:
 +    DEFAULT_SITECONF = 'siteconf.py'
 +
- if 'distribute' not in setuptools.__file__:
-     print "-------------------------------------------------------------------------"
-     print "Setuptools conflict detected."
-@@ -49,7 +55,7 @@
+ def setup(*args, **kwargs):
+     from setuptools import setup
+     import traceback
+@@ -24,7 +30,7 @@
  
  
  class NumpyExtension(Extension):
@@ -24,7 +24,7 @@
      # http://mail.python.org/pipermail/distutils-sig/2007-September/008253.html
      # solution by Michael Hoffmann
      def __init__(self, *args, **kwargs):
-@@ -109,7 +115,7 @@
+@@ -84,7 +90,7 @@
  
  # tools -----------------------------------------------------------------------
  def flatten(list):
@@ -33,7 +33,7 @@
      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 @@
+@@ -224,7 +230,7 @@
  
  
  class ConfigSchema:
@@ -42,7 +42,7 @@
          self.optdict = dict((opt.name, opt) for opt in options)
          self.options = options
          self.conf_dir = conf_dir
-@@ -272,9 +278,9 @@
+@@ -247,9 +253,9 @@
          self.conf_dir = conf_dir
  
      def get_default_config(self):
@@ -54,7 +54,7 @@
      def read_config_from_pyfile(self, filename):
          result = {}
          filevars = {}
-@@ -322,7 +328,7 @@
+@@ -297,7 +303,7 @@
          result = self.get_default_config()
  
          import os
@@ -63,7 +63,7 @@
          confignames = []
          if self.global_conf_file is not None:
              confignames.append(self.global_conf_file)
-@@ -425,13 +431,13 @@
+@@ -400,13 +406,13 @@
          return result
  
      def value_to_str(self, default):
@@ -79,7 +79,7 @@
              default=default_str,
              metavar=self.metavar(), help=self.get_help(default))
  
-@@ -452,11 +458,11 @@
+@@ -427,11 +433,11 @@
              action = "store_false"
          else:
              action = "store_true"
@@ -95,7 +95,7 @@
              default=default,
              action=action)
  
-@@ -484,7 +490,7 @@
+@@ -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,
@@ -104,7 +104,7 @@
                  % (human_name or humanize(lib_name))))
  
  class LibraryDir(StringListOption):
-@@ -496,14 +502,14 @@
+@@ -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,
@@ -122,7 +122,7 @@
                      % humanize(lib_base_name))
  
  def set_up_shipped_boost_if_requested(conf):
-@@ -567,7 +573,7 @@
+@@ -542,7 +548,7 @@
              source_files += glob(
                      "bpl-subset/bpl_subset/libs/thread/src/pthread/*.cpp")
  
@@ -131,7 +131,7 @@
                  {"BOOST_MULTI_INDEX_DISABLE_SERIALIZATION": 1}
                  )
      else:
-@@ -578,7 +584,7 @@
+@@ -553,7 +559,7 @@
      return [
          IncludeDir("BOOST", []),
          LibraryDir("BOOST", []),
@@ -140,7 +140,7 @@
              help="The compiler with which Boost C++ was compiled, e.g. gcc43"),
          ]
  
-@@ -613,10 +619,10 @@
+@@ -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")