summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-10-22 16:07:28 -0400
committerJoey Hess <joey@kitenet.net>2012-10-22 16:07:28 -0400
commitf79ed4ddd81b299fe9b7aab55c0ef01b89989910 (patch)
tree3b9ecbca7b19607c75f9917e9deefb369941c246
parent3eda9d1c88f6b9888c6255f2defdac30310af144 (diff)
adjust other fix
This is really atrocious, but IIRC the order pythons are run in matters, so the earlier mangling of @python_requested must remain, and so unmangle it here.
-rw-r--r--Debian/Debhelper/Buildsystem/python_distutils.pm9
-rw-r--r--debian/changelog2
2 files changed, 9 insertions, 2 deletions
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 81cff3c..fd31730 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -155,7 +155,14 @@ sub setup_py {
}
foreach my $python (@python_dbg, @python_requested) {
- if (-f "/usr/lib/$python/distutils/__init__.py") {
+ my $python_with_version = $python;
+ if ($python eq "python") {
+ $python_with_version = $python_default;
+ }
+ elsif ($python eq "python-dbg") {
+ $python_with_version = $python_default."-dbg";
+ }
+ if (-f "/usr/lib/$python_with_version/distutils/__init__.py") {
# To allow backports of debhelper we don't pass
# --install-layout=deb to 'setup.py install` for
# those Python versions where the option is
diff --git a/debian/changelog b/debian/changelog
index a9af53d..b977faf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ debhelper (9.20120609) UNRELEASED; urgency=low
* python distutils buildsystem: When checking if a version of python is
installed, don't trust the presense of the executable, as
a python2.X-minimal package may provide it while not having
- distutils installed. Closes: #683557
+ distutils installed. Closes: #683557, #690378
* dh_icons: Improve documentation. Closes: #684895
* Improve -X documentation. Closes: #686696
* Support installing multiple doc-base files which use the same doc-id.