In v8 mode, prefer the perl_build buildsystem over perl_makemaker. Closes: #578805

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index a14ff037a1586771b9a5b241035b53cfb45accf7..22f80f9ebdacb39435e8a952ccd9d753199a2c03 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -20,10 +20,11 @@ use constant BUILD_STEPS => qw(configure build test install clean);
 # build systems MUST be added to the END of the list.
 our @BUILDSYSTEMS = (
        "autoconf",
+       (! compat(7) ? "perl_build" : ()),
        "perl_makemaker",
        "makefile",
        "python_distutils",
-       "perl_build",
+       (compat(7) ? "perl_build" : ()),
        "cmake",
        "ant",
        "qmake",

diff --git a/debhelper.pod b/debhelper.pod
index a7735b1f8f5edec920ae333e94369e1471874c4e..554b7f7834eb113941411044b2b0cd7b1592cfd5 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -531,6 +531,10 @@ can cause some packages to fail to build.
 dh requires the sequence to run be specified as the first parameter, and
 any switches come after it. Ie, use "dh $@ --foo", not "dh --foo $@"
 
+=item
+
+dh_auto_* prefer to use perl's Module::Build in preference to Makefile.PL.
+
 =back
 
 =back

diff --git a/debian/changelog b/debian/changelog
index 5df9e2c98d84fa40d91023a696f2d47c7cd1e0a4..0ca846ab2ba457eaa94fe41813d55b5448b4e4c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ debhelper (7.9.1) UNRELEASED; urgency=low
     file with a name like HISTORY. Closes: #582749
   * dh_installchangelogs: Also look for changelog files in doc(s)
     subdirectories. Closes: #521258
+  * In v8 mode, prefer the perl_build buildsystem over perl_makemaker.
+    Closes: #578805
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 May 2010 20:01:19 -0400
 

diff --git a/doc/TODO b/doc/TODO
index 1f500806ac829f2bc49362503d5c7db540364778..6aa3d71b8613ee06e2cf13b03c94bf3f4e741e92 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,11 +1,8 @@
 v8:
 
-* better package arch filtering for -N , -p (#576990)
 * Support DEB_BUILD_OPTIONS=debug ; maybe also support passing
   -g -O2 by default. See patch (and discussion of why this breaks
   compatability) in #544844.
-* Reorder build systems list. perl_build before perl_makemaker.
-  Any other changes? #578805
 
 v9: