Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

diff --git a/debian/changelog b/debian/changelog
index 05369192bae5ff2d63f99e84d198906af02121fc..e81502730cce5168031a2a22d8defa544f7ffdb3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-debhelper (7.2.10) UNRELEASED; urgency=low
+debhelper (7.2.10) unstable; urgency=low
 
   * Close COMPAT_IN filehandle. Closes: #527464
   * dh_auto_configure: Clarify man page re adding configure
     parameters. Closes: #527256
+  * dh_auto_configure: Pass packlist=0 when running Makefile.PL,
+    in case it is a Build.PL passthru, to avoid it creating
+    the .packlist file. Closes: #527990
 
- -- Joey Hess <joeyh@debian.org>  Thu, 07 May 2009 16:33:25 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 10 May 2009 13:07:08 -0400
 
 debhelper (7.2.9) unstable; urgency=low
 

diff --git a/dh_auto_configure b/dh_auto_configure
index da1f75119c268fe80184bd13d4bbf72b34d74f6c..2dc3eb3206006ca2a740178221ed833997716a00 100755 (executable)
--- a/dh_auto_configure
+++ b/dh_auto_configure
@@ -91,7 +91,7 @@ elsif (-e "Makefile.PL") {
        # If set to a true value then MakeMaker's prompt function will
        # # always return the default without waiting for user input.
        $ENV{PERL_MM_USE_DEFAULT}=1;
-       doit("perl", "Makefile.PL", "INSTALLDIRS=vendor", @{$dh{U_PARAMS}});
+       doit("perl", "Makefile.PL", "INSTALLDIRS=vendor", "create_packlist=0", @{$dh{U_PARAMS}});
 }
 elsif (-e "Build.PL") {
        $ENV{PERL_MM_USE_DEFAULT}=1; # Module::Build can also use this.