tags 401040 + patch
thanks

Hi,

Attached is the diff that fixes this bug and does some more cleanup.
If you want me to upload this a NMU, just ask. Otherwise I might upload it
in a few days if I don't hear back from you.

Cheers,
-- 
Raphaël Hertzog

Premier livre français sur Debian GNU/Linux :
http://www.ouaza.com/livre/admin-debian/
diff -u python-setuptools-0.6c3/debian/changelog 
python-setuptools-0.6c3/debian/changelog
--- python-setuptools-0.6c3/debian/changelog
+++ python-setuptools-0.6c3/debian/changelog
@@ -1,3 +1,14 @@
+python-setuptools (0.6c3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fortified the sed invocation (do not hardcode a python version) which fixes
+    the python shebang line of easy_install-* scripts. Closes: #401040
+  * Clean up some build dependencies.
+  * Use again ${python:Depends} but ignore the easy_install-* scripts when
+    generating the depends line (to avoid unwanted dependencies on pythonX.Y).
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]>  Thu, 30 Nov 2006 16:35:43 +0100
+
 python-setuptools (0.6c3-1) unstable; urgency=medium
 
   * New upstream version (release candidate 3). Closes: #389780.
diff -u python-setuptools-0.6c3/debian/control 
python-setuptools-0.6c3/debian/control
--- python-setuptools-0.6c3/debian/control
+++ python-setuptools-0.6c3/debian/control
@@ -2,13 +2,14 @@
 Section: python
 Priority: optional
 Maintainer: Matthias Klose <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 5.0.37.1), python-all, python-central (>= 
0.4.10)
+Build-Depends: debhelper (>= 5.0.37.1)
+Build-Depends-Indep: python-all-dev, python-central (>= 0.5)
 XS-Python-Version: all
 Standards-Version: 3.7.2
 
 Package: python-setuptools
 Architecture: all
-Depends: python, python-central (>= 0.4.11)
+Depends: ${python:Depends}
 Conflicts: python2.3-setuptools (<< 0.6b2), python2.4-setuptools (<< 0.6b2)
 Replaces: python2.3-setuptools, python2.4-setuptools
 Provides: ${python:Provides}
diff -u python-setuptools-0.6c3/debian/rules 
python-setuptools-0.6c3/debian/rules
--- python-setuptools-0.6c3/debian/rules
+++ python-setuptools-0.6c3/debian/rules
@@ -83,10 +83,9 @@
            echo "fixed interpreter: $$i"; \
          fi; \
        done
-       sed -i -e 's/python2.4/python2.3/g' \
-               debian/python-setuptools/usr/bin/easy_install-2.3
-       dh_pycentral -i
-       dh_python -i
+       sed -i -e "1s/python[0-9].[0-9]/python/g" 
debian/python-setuptools/usr/bin/easy_install
+       for easy in debian/python-setuptools/usr/bin/easy_install-*; do 
v=$${easy##debian/python-setuptools/usr/bin/easy_install-}; sed -i -e 
"s/python[0-9].[0-9]/python$$v/g" $$easy; done;
+       dh_pycentral -i -Xusr/bin/easy_install-
        echo 'python:Provides=$(foreach v,$(shell pyversions -r 
debian/control),$(v)-setuptools)' \
                | sed 's/ /, /g' >> $(d).substvars
        dh_installdeb -i

Reply via email to