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

This reverts commit 865e6266a5eaae81004bf530bc23da1c3fdc10b1.

Conflicts:

	debian/changelog

Too late for 8.0.0 since testing is frozen. Will put back in later.

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

diff --git a/debian/changelog b/debian/changelog
index 2516ce7f447c07281d64e0591a30f583634be5cd..0b953b4acbf27d05d0c3ff437dbcfe9eedd14b0e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,6 @@ debhelper (8.0.0) UNRELEASED; urgency=low
   * dh_fixperms: Ensure files in /etc/sudoers.d/ are mode 440. Closes: #589574
 
   [ Joey Hess ]
-  * 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
   * Finalized v8 mode, which is the new recommended default.
 
  -- Carsten Hey <carsten@debian.org>  Sun, 18 Jul 2010 22:30:06 +0200