Merge commit 'origin/buildsystems' into python-build

Conflicts:
	Debian/Debhelper/Buildsystem/python_distutils.pm

diff --cc Debian/Debhelper/Buildsystem/python_distutils.pm
index 4e98226d009935c5115f2a05e5dd8b2a3c255944,69032d21c17e542d1b8245e72469687ea4a54050..e1b1aef0ac94842622d6455e9596572c66635106
--- 1/Debian/Debhelper/Buildsystem/python_distutils.pm
--- 2/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, @_);
                }
        }
  }