diff options
| author | Joey Hess <joey@kitenet.net> | 2009-08-14 21:21:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2009-08-14 21:21:28 -0400 |
| commit | da22465de4cab0e7521d2f706083843be65866a9 (patch) | |
| tree | 6306f897eb21500ce9e2c40f6eb909fd6d871440 | |
| parent | 3e1bc1f4ffa55520c57a397f8dd8bfee2d587e31 (diff) | |
| parent | 639fd291e5c5b11f08af6d64c6966fc0e0655a70 (diff) | |
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
| -rw-r--r-- | Debian/Debhelper/Buildsystem/python_distutils.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 4dc2a0d9..bc6e71f7 100644 --- a/Debian/Debhelper/Buildsystem/python_distutils.pm +++ b/Debian/Debhelper/Buildsystem/python_distutils.pm @@ -145,8 +145,8 @@ sub setup_py { # ignored by distutils/setuptools. if ( $act eq "install" and not ( ($python =~ /^python(?:-dbg)?$/ - and $python_default =~ /^python2.[2345]$/) - or $python =~ /^python2.[2345](?:-dbg)?$/ )) { + and $python_default =~ /^python2\.[2345]$/) + or $python =~ /^python2\.[2345](?:-dbg)?$/ )) { $this->doit_in_sourcedir($python, "setup.py", $act, @_, "--install-layout=deb"); } diff --git a/debian/changelog b/debian/changelog index 0ca81c3a..cf1bcd3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ debhelper (7.3.13) unstable; urgency=low + [ Bernd Zeimetz ] * python_distutils.pm: Support debhelper backports. To allow backports of debhelper we don't pass --install-layout=deb to 'setup.py install` for those Python @@ -7,7 +8,7 @@ debhelper (7.3.13) unstable; urgency=low Thanks to Julian Andres Klode for the bug report. Closes: #539324 - -- Bernd Zeimetz <bzed@debian.org> Sat, 08 Aug 2009 04:22:53 +0200 + -- Joey Hess <joeyh@debian.org> Fri, 14 Aug 2009 20:10:57 -0400 debhelper (7.3.12) unstable; urgency=low |