python_distutils: Pass --force to setup.py build, to ensure that when python-dbg...

(cherry picked from commit 865e6266a5eaae81004bf530bc23da1c3fdc10b1)

Conflicts:

	debian/changelog

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 70307b0fa2023395af5466d0661a8bb65ef3af62..5115a8aea5854c111ecf4b8013c6fded2d7c19dc 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -163,7 +163,9 @@ sub setup_py {
 
 sub build {
        my $this=shift;
-       $this->setup_py("build", @_);
+       $this->setup_py("build",
+               "--force",
+               @_);
 }
 
 sub install {

diff --git a/debian/changelog b/debian/changelog
index 54ec7a04bddfa6b88d504d004c8eb62dad9143aa..8a2016c658250ea47bea17ab3107766f9bc9f566 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (8.1.0) UNRELEASED; urgency=low
+
+  * python_distutils: Pass --force to setup.py build, to ensure that when
+    python-dbg is run it does not win and result in scripts having it in
+    the shebang line. Closes: #589759
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 07 Aug 2010 11:27:24 -0400
+
 debhelper (8.0.0) unstable; urgency=low
 
   [ Carsten Hey ]