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

[morph at users.alioth.debian.org]

    Date: Friday, February 26, 2010 @ 19:34:41
  Author: morph
Revision: 11970

* debian/patches/10_remove_distutils_version_check.dpatch
  - remove the check for distutils version, and the removal of
    --install-layout=deb; thanks to Jakub Wilk for the report; Closes: #571478

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

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2010-02-26 19:27:21 UTC (rev 11969)
+++ packages/logilab-common/trunk/debian/changelog	2010-02-26 19:34:41 UTC (rev 11970)
@@ -8,8 +8,11 @@
     - updated upstream and Debian packaging copyright years
   * debian/{control, rules}
     - added dpatch
+  * debian/patches/10_remove_distutils_version_check.dpatch
+    - remove the check for distutils version, and the removal of
+      --install-layout=deb; thanks to Jakub Wilk for the report; Closes: #571478
 
- -- Sandro Tosi <morph at debian.org>  Fri, 26 Feb 2010 20:25:52 +0100
+ -- Sandro Tosi <morph at debian.org>  Fri, 26 Feb 2010 20:31:46 +0100
 
 logilab-common (0.46.0-1) unstable; urgency=low
 

Added: packages/logilab-common/trunk/debian/patches/00list
===================================================================
--- packages/logilab-common/trunk/debian/patches/00list	                        (rev 0)
+++ packages/logilab-common/trunk/debian/patches/00list	2010-02-26 19:34:41 UTC (rev 11970)
@@ -0,0 +1 @@
+10_remove_distutils_version_check

Added: packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch
===================================================================
--- packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch	                        (rev 0)
+++ packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch	2010-02-26 19:34:41 UTC (rev 11970)
@@ -0,0 +1,32 @@
+#! /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
+
+ at 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
+@@ -174,14 +174,14 @@
+             sys.argv.remove('--force-manifest')
+     except:
+         pass
+-    try:
+-        if not USE_SETUPTOOLS:
+-            from distutils import __version__ as distutils_version
+-            if 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 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 : '.'}


Property changes on: packages/logilab-common/trunk/debian/patches/10_remove_distutils_version_check.dpatch
___________________________________________________________________
Added: svn:executable
   + *