From 7cfdd1dae560276310a79c54ce07f144bb94e23c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 7 Aug 2010 11:26:42 -0400 Subject: [PATCH] Revert "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" This reverts commit 865e6266a5eaae81004bf530bc23da1c3fdc10b1. Conflicts: debian/changelog Too late for 8.0.0 since testing is frozen. Will put back in later. --- Debian/Debhelper/Buildsystem/python_distutils.pm | 4 +--- debian/changelog | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 5115a8a..70307b0 100644 --- 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 2516ce7..0b953b4 100644 --- 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 Sun, 18 Jul 2010 22:30:06 +0200 -- 2.39.2