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

[nijel at users.alioth.debian.org]

    Date: Tuesday, July 19, 2011 @ 09:57:10
  Author: nijel
Revision: 17875

Remove silly check for distribute (Closes: #634343).

Added:
  packages/tagpy/trunk/debian/patches/remove-distribute-check.patch
Modified:
  packages/tagpy/trunk/debian/changelog
  packages/tagpy/trunk/debian/patches/series

Modified: packages/tagpy/trunk/debian/changelog
===================================================================
--- packages/tagpy/trunk/debian/changelog	2011-07-18 21:29:11 UTC (rev 17874)
+++ packages/tagpy/trunk/debian/changelog	2011-07-19 09:57:10 UTC (rev 17875)
@@ -1,8 +1,9 @@
 tagpy (0.94.8-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Remove silly check for distribute (Closes: #634343).
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Sun, 06 Feb 2011 13:06:16 +0100
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 19 Jul 2011 11:57:31 +0200
 
 tagpy (0.94.8-2) unstable; urgency=low
 

Added: packages/tagpy/trunk/debian/patches/remove-distribute-check.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/remove-distribute-check.patch	                        (rev 0)
+++ packages/tagpy/trunk/debian/patches/remove-distribute-check.patch	2011-07-19 09:57:10 UTC (rev 17875)
@@ -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

Modified: packages/tagpy/trunk/debian/patches/series
===================================================================
--- packages/tagpy/trunk/debian/patches/series	2011-07-18 21:29:11 UTC (rev 17874)
+++ packages/tagpy/trunk/debian/patches/series	2011-07-19 09:57:10 UTC (rev 17875)
@@ -1 +1,2 @@
+remove-distribute-check.patch
 optional-siteconf.patch