From: Bernd Zeimetz <bernd@bzed.de>
Date: Sun, 19 Jul 2009 13:50:19 +0000 (+0200)
Subject: Merge commit 'origin/buildsystems' into python-build
X-Git-Tag: 7.3.5~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2ffe6ab1066e769e59b189ccf5801c8c9a56e667;p=debhelper.git

Merge commit 'origin/buildsystems' into python-build

Conflicts:
	Debian/Debhelper/Buildsystem/python_distutils.pm
---

2ffe6ab1066e769e59b189ccf5801c8c9a56e667
diff --cc Debian/Debhelper/Buildsystem/python_distutils.pm
index 4e98226,69032d2..e1b1aef
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@@ -131,12 -131,10 +131,12 @@@ sub setup_py 
  			$this->doit_in_sourcedir($python, "setup.py", $act, @_);
  		}
  		$python = $python . "-dbg";
- 		if (grep /^(python-all-dbg|$python)/, @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))) {
++		if (grep /^(python-all-dbg|\Q$python\E)/, @dbg_build_needed) {
  			$this->doit_in_sourcedir($python, "setup.py", $act, @_);
 +		} elsif (($python eq "python-dbg")
 +			and (grep /^$python_default/, @dbg_build_needed)) {
 +			$this->doit_in_sourcedir($python_default."-dbg",
 +				"setup.py", $act, @_);
  		}
  	}
  }