Merge commit 'bzed/python-build' into buildsystems

Conflicts:
	debian/changelog

2 files changed, 49 insertions, 7 deletions

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 2ee2cc12..9274a7d1 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -79,6 +79,31 @@ sub pre_building_step {
 	$this->SUPER::pre_building_step($step);
 }
 
+sub dbg_build_needed {
+	my $this=shift;
+	my $act=shift;
+
+	# Return a list of python-dbg package which are listed
+	# in the build-dependencies. This is kinda ugly, but building
+	# dbg extensions without checking if they're supposed to be
+	# built may result in various FTBFS if the package is not
+	# built in a clean chroot.
+
+	my @dbg;
+	open (CONTROL,  $this->get_sourcepath('debian/control')) ||
+		error("cannot read debian/control: $!\n");
+	foreach my $builddeps (join('', <CONTROL>) =~ 
+			/^Build-Depends[^:]*:.*\n(?:^[^\w\n].*\n)*/gmi) {
+		foreach ($builddeps =~ /(python[^, ]*-dbg)/g) {
+			push @dbg, $1;
+		}
+	}
+
+	close CONTROL;
+	return @dbg;
+
+}
+
 sub setup_py {
 	my $this=shift;
 	my $act=shift;
@@ -86,16 +111,31 @@ sub setup_py {
 	# We need to to run setup.py with the default python first
 	# as distutils/setuptools modifies the shebang lines of scripts.
 	# This ensures that #!/usr/bin/python is used and not pythonX.Y
+	# Take into account that the default Python must not be in
+	# the requested Python versions.
 	# Then, run setup.py with each available python, to build
-	# extensions for each.
-	my $python_default = `pyversions -d`;
-	$python_default =~ s/^\s+//;
-	$python_default =~ s/\s+$//;
-	foreach my $python ("python", grep(!/^$python_default/,
-				(split ' ', `pyversions -r 2>/dev/null`))) {
+        # extensions for each.
+
+        my $python_default = `pyversions -d`;
+        $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/,
+					@python_requested));
+	}
+        my @dbg_build_needed = $this->dbg_build_needed();
+
+	foreach my $python (@python_requested) {
 		if (-x "/usr/bin/".$python) {
 			$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))){
+			$this->doit_in_sourcedir($python, "setup.py", $act, @_);
+		}
 	}
 }
 
diff --git a/debian/changelog b/debian/changelog
index 9be18b47..ad1b6c69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ debhelper (7.3.5) experimental; urgency=low
     versions that are installed. Ensure that correct shebangs are
     created by using `python' first during build and install.
     Closes: #520834
+    Also build with python*-dbg if the package build-depends
+    on them.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 19 Jul 2009 12:22:14 +0200
+ -- Bernd Zeimetz <bzed@debian.org>  Sun, 19 Jul 2009 15:26:13 +0200
 
 debhelper (7.3.4) experimental; urgency=low