diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-07 11:26:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-07 11:26:42 -0400 |
| commit | 7cfdd1dae560276310a79c54ce07f144bb94e23c (patch) | |
| tree | 01862908a71935edd49df8ad6a0a523c39ae0d1f | |
| parent | 5ade9075ad0fedee986d8aa08a1d4c4d3965356a (diff) | |
| download | debhelper-7cfdd1dae560276310a79c54ce07f144bb94e23c.tar.gz | |
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.
| -rw-r--r-- | Debian/Debhelper/Buildsystem/python_distutils.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 5115a8ae..70307b0f 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 2516ce7f..0b953b4a 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 <carsten@debian.org> Sun, 18 Jul 2010 22:30:06 +0200 |