From: Joey Hess <joey@kitenet.net>
Date: Sat, 7 Aug 2010 15:51:39 +0000 (-0400)
Subject: python_distutils: Pass --force to setup.py build, to ensure that when python-dbg... 
X-Git-Tag: 8.1.0~39
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1f012ae1f98220de04be307beeb74eac80ab451c;p=debhelper.git

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

(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 70307b0..5115a8a 100644
--- 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 54ec7a0..8a2016c 100644
--- 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 ]