From ef9261728727c65424783cdffde8efe91686c61c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Jul 2009 15:33:40 +0200 Subject: update --- debian/changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e70d28f..9be18b47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ debhelper (7.3.5) experimental; urgency=low + [ Bernd Zeimetz ] * python_distutils buildsystem: Build for all supported Python - versions in case they're installed. Ensure that correct - shebangs are created by using `python' first during build - and install. Closes: #520834 + versions that are installed. Ensure that correct shebangs are + created by using `python' first during build and install. + Closes: #520834 - -- Bernd Zeimetz Sun, 19 Jul 2009 03:45:23 +0200 + -- Joey Hess Sun, 19 Jul 2009 12:22:14 +0200 debhelper (7.3.4) experimental; urgency=low -- cgit v1.2.3 From b011eab1cd3d6645ecfa784960da1c0c72ed68d5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Jul 2009 15:45:36 +0200 Subject: fix get_sourcepath use and misc style fixes --- Debian/Debhelper/Buildsystem/python_distutils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 9274a7d1..69032d21 100644 --- a/Debian/Debhelper/Buildsystem/python_distutils.pm +++ b/Debian/Debhelper/Buildsystem/python_distutils.pm @@ -90,11 +90,11 @@ sub dbg_build_needed { # built in a clean chroot. my @dbg; - open (CONTROL, $this->get_sourcepath('debian/control')) || + open (CONTROL, 'debian/control') || error("cannot read debian/control: $!\n"); foreach my $builddeps (join('', ) =~ /^Build-Depends[^:]*:.*\n(?:^[^\w\n].*\n)*/gmi) { - foreach ($builddeps =~ /(python[^, ]*-dbg)/g) { + while ($builddeps =~ /(python[^, ]*-dbg)/g) { push @dbg, $1; } } @@ -120,8 +120,8 @@ sub setup_py { $python_default =~ s/^\s+//; $python_default =~ s/\s+$//; my @python_requested = split ' ', `pyversions -r 2>/dev/null`; - if (grep /^$python_default/, @python_requested) { - @python_requested = ("python", grep(!/^$python_default/, + if (grep /^\Q$python_default\E/, @python_requested) { + @python_requested = ("python", grep(!/^\Q$python_default\E/, @python_requested)); } my @dbg_build_needed = $this->dbg_build_needed(); @@ -131,9 +131,9 @@ sub setup_py { $this->doit_in_sourcedir($python, "setup.py", $act, @_); } $python = $python . "-dbg"; - if ((grep /^(python-all-dbg|$python)/, @dbg_build_needed) - or (($python eq "python-dbg") - and (grep /^$python_default/, @dbg_build_needed))){ + if ((grep /^(python-all-dbg|\Q$python\E)/, @dbg_build_needed) + or (($python eq "python-dbg") and + (grep /^$python_default/, @dbg_build_needed))) { $this->doit_in_sourcedir($python, "setup.py", $act, @_); } } -- cgit v1.2.3