[Python-modules-commits] r30931 - in packages/tagpy/trunk/debian (3 files)

[nijel at users.alioth.debian.org]

    Date: Monday, October 6, 2014 @ 08:41:34
  Author: nijel
Revision: 30931

Use system setuptools for building.

Added:
  packages/tagpy/trunk/debian/patches/installed-setuptools.patch
Modified:
  packages/tagpy/trunk/debian/changelog
  packages/tagpy/trunk/debian/patches/series

Modified: packages/tagpy/trunk/debian/changelog
===================================================================
--- packages/tagpy/trunk/debian/changelog	2014-10-06 08:39:06 UTC (rev 30930)
+++ packages/tagpy/trunk/debian/changelog	2014-10-06 08:41:34 UTC (rev 30931)
@@ -3,6 +3,7 @@
   * Add missing python-pkg-resources build dependency.
   * Bump standards to 3.9.6.
   * Adjust Vcs-Svn URL.
+  * Use system setuptools for building.
 
  -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 06 Oct 2014 10:22:24 +0200
 

Added: packages/tagpy/trunk/debian/patches/installed-setuptools.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/installed-setuptools.patch	                        (rev 0)
+++ packages/tagpy/trunk/debian/patches/installed-setuptools.patch	2014-10-06 08:41:34 UTC (rev 30931)
@@ -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

Modified: packages/tagpy/trunk/debian/patches/series
===================================================================
--- packages/tagpy/trunk/debian/patches/series	2014-10-06 08:39:06 UTC (rev 30930)
+++ packages/tagpy/trunk/debian/patches/series	2014-10-06 08:41:34 UTC (rev 30931)
@@ -1,2 +1,3 @@
 taglib-1.8.patch
 optional-siteconf.patch
+installed-setuptools.patch