[SCM] Debian packaging of dh-make-perl branch, master, updated. 81db057665beb8e6ee2aab6efb9a49fe9ea8f688

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 81db057665beb8e6ee2aab6efb9a49fe9ea8f688
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sat Aug 20 18:00:30 2011 +0300

    fix t/debian-version.t to not plan twice
    
    When testing the CPAN distribution, debian/changelog does not exist
    
    Thanks to Peter Flanigan for the patch. RT#66214

diff --git a/debian/changelog b/debian/changelog
index 1882f1c..f4e0b67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ dh-make-perl (0.74-1) UNRELEASED; urgency=low
   * Packaging.pm: extend the examples regular expression to match demo/demos.
     Thanks to Kevin Ryde. Closes: #634932
   * add pristine-tar to Recommends. Thanks to Tim.
+  * fix t/debian-version.t to not plan twice in case debian/changelog does not
+    exist (e.g. when testing the CPAN distribution, which lacks debian/ stuff)
+    RT#66214
 
   [ gregor herrmann ]
   * Update created Vcs-Browser URLs for Debian Perl Group repositories.
diff --git a/dh-make-perl b/dh-make-perl
index 9ede663..5ea3c64 100755
--- a/dh-make-perl
+++ b/dh-make-perl
@@ -505,6 +505,8 @@ Patches from:
 
 =item Paul Fenwick E<lt>pjf at perltraining.com.auE<gt>
 
+=item Peter Flanigan E<lt>Support at RoxSoft.co.ukE<gt>
+
 =item Peter Moerch E<lt>mn3k66i02 at sneakemail.comE<gt>
 
 =item Peter Pentchev E<lt>roam at ringlet.netE<gt>
diff --git a/t/debian-version.t b/t/debian-version.t
index 3a6e309..3de1717 100644
--- a/t/debian-version.t
+++ b/t/debian-version.t
@@ -1,6 +1,6 @@
 #!perl -T
 
-use Test::More tests => 1;
+use Test::More;
 
 use DhMakePerl;
 
@@ -10,6 +10,8 @@ use Parse::DebianChangelog;
 plan skip_all => "'no 'debian/changelog' found"
     unless -f "$Bin/../debian/changelog";
 
+plan tests => 1;
+
 my $cl = Parse::DebianChangelog->init->parse( { infile => "$Bin/../debian/changelog" } );
 
 my $pkg_ver = $cl->data( { count => 1   } )->[0]->{Version};

-- 
Debian packaging of dh-make-perl