[Python-modules-commits] r12296 - in packages/logilab-common/trunk/debian (2 files)

[morph at users.alioth.debian.org]

    Date: Saturday, March 20, 2010 @ 09:22:25
  Author: morph
Revision: 12296

* debian/patches/10_remove_distutils_version_check.dpatch
  - updated for new upstream code

Modified:
  packages/logilab-common/trunk/debian/changelog
  packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2010-03-20 09:10:28 UTC (rev 12295)
+++ packages/logilab-common/trunk/debian/changelog	2010-03-20 09:22:25 UTC (rev 12296)
@@ -4,8 +4,10 @@
   * debian/control
     - drop Suggests on python-pyodbc, now the database layer is moved in another
       package
+  * debian/patches/10_remove_distutils_version_check.dpatch
+    - updated for new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Sat, 20 Mar 2010 10:10:14 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 20 Mar 2010 10:20:59 +0100
 
 logilab-common (0.48.1-1) unstable; urgency=low
 

Modified: packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch
===================================================================
--- packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch	2010-03-20 09:10:28 UTC (rev 12295)
+++ packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch	2010-03-20 09:22:25 UTC (rev 12296)
@@ -5,8 +5,8 @@
 
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' logilab-common~/setup.py logilab-common/setup.py
---- logilab-common~/setup.py	2010-02-17 15:21:35.000000000 +0100
-+++ logilab-common/setup.py	2010-02-26 20:28:20.604618001 +0100
+--- logilab-common~/setup.py	2010-03-16 17:21:20.000000000 +0100
++++ logilab-common/setup.py	2010-03-20 10:20:36.991578004 +0100
 @@ -174,14 +174,14 @@
              sys.argv.remove('--force-manifest')
      except:
@@ -14,7 +14,7 @@
 -    try:
 -        if not USE_SETUPTOOLS:
 -            from distutils import __version__ as distutils_version
--            if distutils_version.split('.') <= (2, 5, 1):
+-            if tuple([int(x) for x in distutils_version.split('.')]) <= (2, 5, 1):
 -                sys.argv.remove('--install-layout=deb')
 -                print "W: remove '--install-layout=deb' option"
 -    except:
@@ -22,7 +22,7 @@
 +#    try:
 +#        if not USE_SETUPTOOLS:
 +#            from distutils import __version__ as distutils_version
-+#            if distutils_version.split('.') <= (2, 5, 1):
++#            if tuple([int(x) for x in distutils_version.split('.')]) <= (2, 5, 1):
 +#                sys.argv.remove('--install-layout=deb')
 +#                print "W: remove '--install-layout=deb' option"
 +#    except: