From: Joey Hess <joey@kitenet.net>
Date: Thu, 24 Jun 2010 00:40:16 +0000 (-0400)
Subject: In v8 mode, stop passing packlist=0 in perl_makemaker buildsystem, since perl_build... 
X-Git-Tag: 7.9.2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6dd52d5bc8b79447bfa7183c5de406c399d5884d;p=debhelper.git

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.
---

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