[dh-make-perl] 06/07: Change handling of Module::Build build dependency.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository dh-make-perl.

commit 8705b15247d1b66b3cb66c56a5fa19a3f97eb166
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Oct 1 23:36:15 2015 +0200

    Change handling of Module::Build build dependency.
    
    Module::Build is removed from perl core since 5.21.x, so we need
    libmodule-build-perl in Build-Depends.
---
 lib/DhMakePerl/Command/Packaging.pm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index 82305bd..a260847 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -1519,18 +1519,14 @@ sub discover_utility_deps {
 
     }
 
-    # there are old packages that still build-depend on libmodule-build-perl
-    # or perl (>= 5.10) | libmodule-build-perl.
-    # Since M::B is part of perl 5.10, the build-dependency needs correction
-    # and we replace this Build-Depends with simply perl, as lenny has the
-    # required version.
-    # Remove perl from Build-Depends-Indep as then perl will be already in
-    # Build-Depends.
+    # Ensure both libmodule-build-perl and perl are in B-D
+    # (and not in B-D-I).
     if ( $self->module_build eq 'Module-Build' ) {
-        $build_deps->remove('perl (>= 5.10) | libmodule-build-perl');
-        $build_deps->remove('libmodule-build-perl');
+        $build_deps_indep->remove('libmodule-build-perl');
         $build_deps_indep->remove('perl');
         $self->explained_dependency( 'Module::Build', $build_deps,
+            'libmodule-build-perl' );
+        $self->explained_dependency( 'Module::Build', $build_deps,
             'perl' );
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git