diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-06-28 16:27:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-06-28 16:27:53 -0400 |
| commit | 13e1de542d940506fdad6f14620131310bd8ec11 (patch) | |
| tree | 3826ee89d20912718ebe349e97ca60cb9fada288 | |
| parent | af351ff3d870c0559afd79fad0341f6a558e3900 (diff) | |
| parent | 63a9ae5d8a3af3d8c707187fb7cb55d55533a7df (diff) | |
| download | debhelper-13e1de542d940506fdad6f14620131310bd8ec11.tar.gz | |
Merge branch 'master' into buildsystems
Conflicts:
dh_auto_install
| -rw-r--r-- | Debian/Debhelper/Buildsystem/python_distutils.pm | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 46f4c1c1..39a4466a 100644 --- a/Debian/Debhelper/Buildsystem/python_distutils.pm +++ b/Debian/Debhelper/Buildsystem/python_distutils.pm @@ -89,7 +89,12 @@ sub build { sub install { my $this=shift; my $destdir=shift; - $this->setup_py("install", "--root=$destdir", "--no-compile", "-O0", @_); + $this->setup_py("install", + "--root=$destdir", + "--no-compile", + "-O0", + "--install-layout=deb", + @_); } sub clean { diff --git a/debian/changelog b/debian/changelog index bd72d497..9120e2f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ debhelper (7.2.18) UNRELEASED; urgency=low * dh_shlibdeps: Ensure DEBIAN directory exists, as dpkg-shlibdeps prints a confusing warning if it does not. Closes: #534226 + * dh_auto_install: Pass --install-layout=deb to setup.py + to support python 2.6. Closes: #534620 -- Joey Hess <joeyh@debian.org> Sun, 28 Jun 2009 15:59:11 -0400 |