r62421 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl/Command/Packaging.pm

[carnil-guest at users.alioth.debian.org]

Author: carnil-guest
Date: Thu Sep  9 07:38:23 2010
New Revision: 62421

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=62421
Log:
Improve regular expression to not match fields in Makefile.PL as
MIN_PERL_VERSION to determine the version of the package. Thanks to
Andrew Ruthven for reporting. (Closes: #596025)

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=62421&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Thu Sep  9 07:38:23 2010
@@ -1,9 +1,15 @@
 dh-make-perl (0.71-1) UNRELEASED; urgency=low
 
+  [ Ansgar Burchardt ]
   * DhMakePerl::Command::Packaging: Refer to "Debian systems" instead of
     "Debian GNU/Linux systems" in generated debian/copyright.
 
- -- Ansgar Burchardt <ansgar at 43-1.org>  Sat, 28 Aug 2010 15:26:16 +0900
+  [ Salvatore Bonaccorso ]
+  * Improve regular expression to not match fields in Makefile.PL as
+    MIN_PERL_VERSION to determine the version of the package. Thanks to
+    Andrew Ruthven for reporting. (Closes: #596025)
+
+ -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Wed, 08 Sep 2010 22:25:30 +0200
 
 dh-make-perl (0.70-1) unstable; urgency=low
 

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm?rev=62421&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Thu Sep  9 07:38:23 2010
@@ -398,7 +398,7 @@
         $ver = $self->cfg->version;
 
     }
-    elsif ( $file =~ /([\'\"]?)VERSION\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s ) {
+    elsif ( $file =~ /([\'\"]?)\bVERSION\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s ) {
 
         # Regular MakeMaker
         $ver = $4;