[SCM] Debian packaging of dh-make-perl branch, master, updated. debian/0.76-1-49-g697e0a9

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 697e0a9c04d9ce762f269de80522d9b0cb503cca
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed May 22 08:28:07 2013 +0300

    use dh 9 for arch:any packages to get hardening flags

diff --git a/TODO b/TODO
index 23977df..570da82 100644
--- a/TODO
+++ b/TODO
@@ -35,7 +35,5 @@
 * debhelper:
   (1) remove all the special casing for debhelper 7.x
       we require >= 8 anyway and die on <=7
-  (2) add debhelper 9.20120312 (and d/compat 9) for arch:any packages
-      to get all hardening flags
   (3) use debhelper 9 to get rid of the "dh_pysupport: This program is
       deprecated" warning. ~abe
diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index feba52d..9318163 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -273,6 +273,10 @@ sub extract_basic {
         find( sub { $self->check_for_xs }, $self->main_dir );
     }
 
+    $self->cfg->dh('9')
+        if $bin->Architecture eq 'any'
+        and not $self->cfg->_explicitly_set->{dh};
+
     printf(
         "Found: %s %s (%s arch=%s)\n",
         $self->perlname, $self->version,
@@ -1469,7 +1473,9 @@ sub discover_utility_deps {
     $deps->remove( 'quilt', 'debhelper' );
 
     # start with the minimum
-    $deps->add( Debian::Dependency->new( 'debhelper', $self->cfg->dh ) );
+    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->Values(0)->Architecture eq 'all' ) {
         $control->source->Build_Depends_Indep->add('perl');
@@ -1635,7 +1641,7 @@ sub _file_w {
 
 =item Copyright (C) 2007-2013 Gregor Herrmann <gregoa at debian.org>
 
-=item Copyright (C) 2007,2008,2009,2010,2012 Damyan Ivanov <dmn at debian.org>
+=item Copyright (C) 2007,2008,2009,2010,2012,2013 Damyan Ivanov <dmn at debian.org>
 
 =item Copyright (C) 2008, Roberto C. Sanchez <roberto at connexer.com>
 
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/compat b/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/compat
index 45a4fb7..ec63514 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/compat
+++ b/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/compat
@@ -1 +1 @@
-8
+9
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/control b/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/control
index 1702025..595cab4 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/control
+++ b/t/dists/Strange-2.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 (>= 8),
+Build-Depends: debhelper (>= 9.20120312),
  perl
 Standards-Version: 3.9.4
 Homepage: https://metacpan.org/release/Strange/
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh-email/compat b/t/dists/Strange-2.1/wanted-debian--refresh-email/compat
index 45a4fb7..ec63514 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh-email/compat
+++ b/t/dists/Strange-2.1/wanted-debian--refresh-email/compat
@@ -1 +1 @@
-8
+9
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh-email/control b/t/dists/Strange-2.1/wanted-debian--refresh-email/control
index 5606aac..b148cbe 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh-email/control
+++ b/t/dists/Strange-2.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 (>= 8),
+Build-Depends: debhelper (>= 9.20120312),
  perl
 Standards-Version: 3.9.4
 Homepage: https://metacpan.org/release/Strange/
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh/compat b/t/dists/Strange-2.1/wanted-debian--refresh/compat
index 45a4fb7..ec63514 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh/compat
+++ b/t/dists/Strange-2.1/wanted-debian--refresh/compat
@@ -1 +1 @@
-8
+9
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh/control b/t/dists/Strange-2.1/wanted-debian--refresh/control
index 1702025..595cab4 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh/control
+++ b/t/dists/Strange-2.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 (>= 8),
+Build-Depends: debhelper (>= 9.20120312),
  perl
 Standards-Version: 3.9.4
 Homepage: https://metacpan.org/release/Strange/
diff --git a/t/dists/Strange-2.1/wanted-debian/compat b/t/dists/Strange-2.1/wanted-debian/compat
index 45a4fb7..ec63514 100644
--- a/t/dists/Strange-2.1/wanted-debian/compat
+++ b/t/dists/Strange-2.1/wanted-debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/t/dists/Strange-2.1/wanted-debian/control b/t/dists/Strange-2.1/wanted-debian/control
index 1702025..595cab4 100644
--- a/t/dists/Strange-2.1/wanted-debian/control
+++ b/t/dists/Strange-2.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 (>= 8),
+Build-Depends: debhelper (>= 9.20120312),
  perl
 Standards-Version: 3.9.4
 Homepage: https://metacpan.org/release/Strange/

-- 
Debian packaging of dh-make-perl