invert python ordering

--force allows doing so

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 9b20e185c2a48aca7df0cbc4fc8e225d5dffd29f..219c6f9bd633a1592575e1a95770e420e7516c17 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -108,9 +108,10 @@ sub setup_py {
        my $this=shift;
        my $act=shift;
 
-       # We need to to run setup.py with the default python first
+       # We need to to run setup.py with the default python last
        # as distutils/setuptools modifies the shebang lines of scripts.
-       # This ensures that #!/usr/bin/python is used and not pythonX.Y
+       # This ensures that #!/usr/bin/python is installed last and
+       # not pythonX.Y
        # Take into account that the default Python must not be in
        # the requested Python versions.
        # Then, run setup.py with each available python, to build
@@ -121,8 +122,10 @@ sub setup_py {
         $python_default =~ s/\s+$//;
         my @python_requested = split ' ', `pyversions -r 2>/dev/null`;
        if (grep /^\Q$python_default\E/, @python_requested) {
-               @python_requested = ("python", grep(!/^\Q$python_default\E/,
-                                       @python_requested));
+               @python_requested = (
+                       grep(!/^\Q$python_default\E/, @python_requested),
+                       "python",
+               );
        }
 
        my @python_dbg;
@@ -137,7 +140,7 @@ sub setup_py {
                }
        }
 
-       foreach my $python (@python_requested, @python_dbg) {
+       foreach my $python (@python_dbg, @python_requested) {
                if (-x "/usr/bin/".$python) {
                        # To allow backports of debhelper we don't pass
                        # --install-layout=deb to 'setup.py install` for

diff --git a/debian/changelog b/debian/changelog
index 314561067d9c86fe51a9539e65fd2c69b27e4d29..1f74f0d1af0bcb9f05c9d16c348b092b2145b9cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ debhelper (7.4.3) UNRELEASED; urgency=low
   * dh_perl: Do not look at perl scripts under /usr/share/doc.
     Closes: #546683
   * Allow dpkg-architecture to print errors to stderr. Closes: #548636
+  * python_distutils: Run default python last, not first, and pass --force
+    to setup.py install to ensure that timestamps do not prevent installation
+    of the scripts built for the default python, without versioned shebang
+    lines. Closes: #547510 (Thanks, Andrew Straw)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 15 Sep 2009 13:18:35 -0400