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

[morph at users.alioth.debian.org]

    Date: Monday, April 26, 2010 @ 21:51:23
  Author: morph
Revision: 12768

* debian/patches/10_remove_distutils_version_check.dpatch
  - adapted to 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-04-26 18:52:53 UTC (rev 12767)
+++ packages/logilab-common/trunk/debian/changelog	2010-04-26 21:51:23 UTC (rev 12768)
@@ -5,8 +5,10 @@
     - removed XB-Python-Version from binary stanza
   * debian/copyright
     - upstream switched from GPLv2 to LPGLv2.1, updating information accordingly
+  * debian/patches/10_remove_distutils_version_check.dpatch
+    - adapted to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Fri, 23 Apr 2010 19:04:40 +0200
+ -- Sandro Tosi <morph at debian.org>  Mon, 26 Apr 2010 23:51:03 +0200
 
 logilab-common (0.49.0-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-04-26 18:52:53 UTC (rev 12767)
+++ packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch	2010-04-26 21:51:23 UTC (rev 12768)
@@ -1,32 +1,18 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 10_remove_distutils_version_check.dpatch by Sandro Tosi <morph at debian.org>
 ##
-## DP: Remove check for distutils version and removal of --install-layout=deb
+## DP: Fix spelling error in version check
 
 @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-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')
+--- logilab-common~/setup.py	2010-04-20 11:00:32.000000000 +0200
++++ logilab-common/setup.py	2010-04-23 19:37:02.697413120 +0200
+@@ -158,7 +158,7 @@
+     try:
+         if not USE_SETUPTOOLS:
+             # install-layout option was introduced in 2.5.3-1~exp1
+-            if sys.versioninfo < (2, 5, 4):
++            if sys.version_info < (2, 5, 4):
+                 sys.argv.remove('--install-layout=deb')
+                 print "W: remove '--install-layout=deb' option"
      except:
-         pass
--    try:
--        if not USE_SETUPTOOLS:
--            from distutils import __version__ as distutils_version
--            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:
--        pass
-+#    try:
-+#        if not USE_SETUPTOOLS:
-+#            from distutils import __version__ as distutils_version
-+#            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:
-+#        pass
-     if subpackage_of:
-         package = subpackage_of + '.' + modname
-         kwargs['package_dir'] = {package : '.'}