[dh-make-perl] 01/08: DhMakePerl::Command::Packaging: require debhelper 9.20120312 only for arch:any

[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 c04b6fc09808155cd1cf2da617468622cb188170
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jan 18 16:50:14 2014 +0100

    DhMakePerl::Command::Packaging: require debhelper 9.20120312 only for arch:any
    
    packages; for arch:all debhelper 8 or 9 are enough.
---
 lib/DhMakePerl/Command/Packaging.pm                                   | 4 ++--
 .../wanted-debian--refresh--source-format=3.0_quilt/control           | 2 +-
 t/dists/Strange-0.1/wanted-debian--refresh-email/control              | 2 +-
 t/dists/Strange-0.1/wanted-debian--refresh/control                    | 2 +-
 t/dists/Strange-0.1/wanted-debian/control                             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index 226ebc4..4ab2836 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -1469,15 +1469,15 @@ sub discover_utility_deps {
 
     # start with the minimum
     my $debhelper_version = $self->cfg->dh;
-    $debhelper_version = '9.20120312' if $debhelper_version eq '9';
-    $deps->add( Debian::Dependency->new( 'debhelper', $debhelper_version ) );
 
     if ( $control->binary_tie->Values(0)->Architecture eq 'all' ) {
         $control->source->Build_Depends_Indep->add('perl');
     }
     else {
         $deps->add('perl');
+        $debhelper_version = '9.20120312' if $debhelper_version eq '9';
     }
+    $deps->add( Debian::Dependency->new( 'debhelper', $debhelper_version ) );
 
     $self->explained_dependency( 'Module::AutoInstall', $deps,
         'debhelper (>= 7.2.13)' )
diff --git a/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control b/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control
index 8b5e914..6669379 100644
--- a/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control
+++ b/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control
@@ -2,7 +2,7 @@ Source: libstrange-perl
 Section: perl
 Priority: optional
 Maintainer: Joe Maintainer <joemaint at test.local>
-Build-Depends: debhelper (>= 9.20120312)
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: perl
 Standards-Version: 3.9.5
 Homepage: https://metacpan.org/release/Strange
diff --git a/t/dists/Strange-0.1/wanted-debian--refresh-email/control b/t/dists/Strange-0.1/wanted-debian--refresh-email/control
index 9284bdb..2775dd4 100644
--- a/t/dists/Strange-0.1/wanted-debian--refresh-email/control
+++ b/t/dists/Strange-0.1/wanted-debian--refresh-email/control
@@ -2,7 +2,7 @@ Source: libstrange-perl
 Section: perl
 Priority: optional
 Maintainer: Florian Geekwurt <florian at geekwurt.org>
-Build-Depends: debhelper (>= 9.20120312)
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: perl
 Standards-Version: 3.9.5
 Homepage: https://metacpan.org/release/Strange
diff --git a/t/dists/Strange-0.1/wanted-debian--refresh/control b/t/dists/Strange-0.1/wanted-debian--refresh/control
index 8b5e914..6669379 100644
--- a/t/dists/Strange-0.1/wanted-debian--refresh/control
+++ b/t/dists/Strange-0.1/wanted-debian--refresh/control
@@ -2,7 +2,7 @@ Source: libstrange-perl
 Section: perl
 Priority: optional
 Maintainer: Joe Maintainer <joemaint at test.local>
-Build-Depends: debhelper (>= 9.20120312)
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: perl
 Standards-Version: 3.9.5
 Homepage: https://metacpan.org/release/Strange
diff --git a/t/dists/Strange-0.1/wanted-debian/control b/t/dists/Strange-0.1/wanted-debian/control
index 8b5e914..6669379 100644
--- a/t/dists/Strange-0.1/wanted-debian/control
+++ b/t/dists/Strange-0.1/wanted-debian/control
@@ -2,7 +2,7 @@ Source: libstrange-perl
 Section: perl
 Priority: optional
 Maintainer: Joe Maintainer <joemaint at test.local>
-Build-Depends: debhelper (>= 9.20120312)
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: perl
 Standards-Version: 3.9.5
 Homepage: https://metacpan.org/release/Strange

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