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

diff --git a/debian/changelog b/debian/changelog
index 1a41613ce0172b3ed937ff6c0ecb169c26ee8ffc..c8e728446965977a742e8b70b714fc69e81bd9e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.2.5) UNRELEASED; urgency=low
+
+  * Set MODULEBUILDRC=/dev/null when running perl Build scripts
+    to avoid ~/.modulebuildrc influencing the build. Closes: #517423
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Mar 2009 13:23:34 -0400
+
 debhelper (7.2.4) unstable; urgency=low
 
   * dh_makeshlibs: Fix --add-udeb, for real. Closes: #518706

diff --git a/dh_auto_build b/dh_auto_build
index a3c95211847441751d16fa277ae6400032cecb20..75ce51cf78d19180cef1ba1bd0c45db798ce499b 100755 (executable)
--- a/dh_auto_build
+++ b/dh_auto_build
@@ -46,6 +46,7 @@ elsif (-e "setup.py") {
        doit("python", "setup.py", "build", @{$dh{U_PARAMS}});
 }
 elsif (-e "Build.PL" && -e "Build") {
+       $ENV{MODULEBUILDRC} = "/dev/null";
        doit("perl", "Build", @{$dh{U_PARAMS}});
 }
 

diff --git a/dh_auto_clean b/dh_auto_clean
index 6c97b106a491a3ed62f5969b56dbc7d7944a3005..610155ae5653eaad2d69e79b5807c54d021bc73f 100755 (executable)
--- a/dh_auto_clean
+++ b/dh_auto_clean
@@ -60,6 +60,7 @@ elsif (-e "setup.py") {
        doit('find', '.', '-name', '*.pyc', '-exec', 'rm', '{}', ';');
 }
 elsif (-e "Build.PL" && -e "Build") {
+       $ENV{MODULEBUILDRC} = "/dev/null";
        doit("perl", "Build", "--allow_mb_mismatch", 1, "distclean", @{$dh{U_PARAMS}});
 }
 

diff --git a/dh_auto_configure b/dh_auto_configure
index 6b8adf524d016c3996ff98cad586ccf111d0e494..41f6210fb29cce210fa902cf7ef969e5bcc4060a 100755 (executable)
--- a/dh_auto_configure
+++ b/dh_auto_configure
@@ -92,6 +92,7 @@ elsif (-e "Makefile.PL") {
 }
 elsif (-e "Build.PL") {
        $ENV{PERL_MM_USE_DEFAULT}=1; # Module::Build can also use this.
+       $ENV{MODULEBUILDRC} = "/dev/null";
        doit("perl", "Build.PL", "installdirs=vendor", @{$dh{U_PARAMS}});
 }
 

diff --git a/dh_auto_install b/dh_auto_install
index 8e7ab907ae8b5123fb6753db73b00285a65726d7..264725ca80da60ea64c02289a36cc23548c94592 100755 (executable)
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -90,6 +90,7 @@ elsif (-e "setup.py") {
                @{$dh{U_PARAMS}});
 }
 elsif (-e "Build.PL" && -e "Build") {
+       $ENV{MODULEBUILDRC} = "/dev/null";
        doit("perl", "Build", "install", "destdir=$destdir",
                "create_packlist=0", @{$dh{U_PARAMS}});
 }

diff --git a/dh_auto_test b/dh_auto_test
index 05c11b225fef080a8cfebb3ae5d080cd49a4a92f..baccd10af59b7233903a9baa84e0e15539f352c4 100755 (executable)
--- a/dh_auto_test
+++ b/dh_auto_test
@@ -55,6 +55,7 @@ if (-e "Makefile" || -e "makefile" || -e "GNUmakefile") {
        }
 }
 elsif (-e "Build.PL" && -e "Build") {
+       $ENV{MODULEBUILDRC} = "/dev/null";
        doit(qw/perl Build test/, @{$dh{U_PARAMS}});
 }