summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-06-23 20:40:16 -0400
committerJoey Hess <joey@kitenet.net>2010-06-23 20:40:16 -0400
commit6dd52d5bc8b79447bfa7183c5de406c399d5884d (patch)
treeb3bf19e79abbb13fc8596d10724e14b4f16b58f0
parent64b1a073efe45652dac5f62f5b336584e81bfc5f (diff)
In v8 mode, stop passing packlist=0 in perl_makemaker buildsystem, since perl_build is tried first. Avoids the makemaker warning message introduced by the fix to #527990.
-rw-r--r--Debian/Debhelper/Buildsystem/perl_makemaker.pm6
-rw-r--r--debian/changelog8
2 files changed, 12 insertions, 2 deletions
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index b2500ab..c8e25b6 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -45,8 +45,10 @@ sub configure {
$ENV{PERL_AUTOINSTALL}="--skipdeps";
$this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor",
- "create_packlist=0",
- @_);
+ # if perl_build is not tested first, need to pass packlist
+ # option to handle fallthrough case
+ (compat(7) ? "create_packlist=0" : ()),
+ @_);
}
sub install {
diff --git a/debian/changelog b/debian/changelog
index 0d40a25..cbc8f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (7.9.2) UNRELEASED; urgency=low
+
+ * In v8 mode, stop passing packlist=0 in perl_makemaker buildsystem,
+ since perl_build is tried first. Avoids the makemaker warning message
+ introduced by the fix to #527990.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 23 Jun 2010 20:36:16 -0400
+
debhelper (7.9.1) unstable; urgency=low
* Started work on Debhelper v8. It is still experimental, and more