Merge branch 'master' into buildsystems

Conflicts:
	dh_auto_install

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 46f4c1c18b94fc725e212c8a56e093dc0e07650a..39a4466ad58c8ce034c5038b9ad473a7234a01db 100644 (file)
--- 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 bd72d497c78ce302623a7c111348c44649dc1f40..9120e2f8c8a7309d8517132cfc67b326b3076ad5 100644 (file)
--- 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