summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-28 15:04:22 -0400
committerJoey Hess <joey@kitenet.net>2010-05-28 15:04:26 -0400
commit80c6dde6a7f9e29e0e00a775bf5c3bf84d3f9282 (patch)
treee5af8d8bf4a3136fcb8701e294a793bc3b8e03ab
parent4b62726560265020e5d44453e93e49e8f44aced0 (diff)
In v8 mode, prefer the perl_build buildsystem over perl_makemaker. Closes: #578805
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm3
-rw-r--r--debhelper.pod4
-rw-r--r--debian/changelog2
-rw-r--r--doc/TODO3
4 files changed, 8 insertions, 4 deletions
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index a14ff03..22f80f9 100644
--- 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 a7735b1..554b7f7 100644
--- 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 5df9e2c..0ca846a 100644
--- 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 1f50080..6aa3d71 100644
--- 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: