r5378 - in /tools/dh-make-perl/trunk: debian/changelog dh-make-perl

[gwolf at users.alioth.debian.org]

Author: gwolf
Date: Wed May  9 21:23:55 2007
New Revision: 5378

URL: http://svn.debian.org/wsvn/?sc=1&rev=5378
Log:
Fixed the regex for finding the module name under Module::Install

Modified:
    tools/dh-make-perl/trunk/debian/changelog
    tools/dh-make-perl/trunk/dh-make-perl

Modified: tools/dh-make-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/tools/dh-make-perl/trunk/debian/changelog?rev=5378&op=diff
==============================================================================
--- tools/dh-make-perl/trunk/debian/changelog (original)
+++ tools/dh-make-perl/trunk/debian/changelog Wed May  9 21:23:55 2007
@@ -6,8 +6,11 @@
   [ Gunnar Wolf ]
   * Trimmed unneeded whitespace from generated files - Thanks to Kees
     Cook <kees at outflux.net> for the patch! (Closes: #411282)
-
- -- Gunnar Wolf <gwolf at debian.org>  Fri, 23 Feb 2007 18:06:25 -0600
+  * Patched regex for finding the module name when unde Module::Install,
+    allowing for whitespace between the "name" string and the module
+    name. Thanks to Marc Chantreux for the patch (and the patience ;-) )
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 23 Feb 2007 18:29:34 -0600
 
 dh-make-perl (0.25) unstable; urgency=low
 

Modified: tools/dh-make-perl/trunk/dh-make-perl
URL: http://svn.debian.org/wsvn/tools/dh-make-perl/trunk/dh-make-perl?rev=5378&op=diff
==============================================================================
--- tools/dh-make-perl/trunk/dh-make-perl (original)
+++ tools/dh-make-perl/trunk/dh-make-perl Wed May  9 21:23:55 2007
@@ -456,13 +456,29 @@
 	close(MF);
 
 	# Get the name
-	if ($file =~ /([\'\"]?)DISTNAME\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s) {
+	if ($file =~ /([\'\"]?)
+	    DISTNAME\1\s*
+	    (=>|,)
+	    \s*
+	    ([\'\"]?)
+	    (\S+)\3/xs) {
 	    # Regular MakeMaker
 	    $name = $4;
-	} elsif ($file =~ /([\'\"]?)NAME\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s) {
+	} elsif ($file =~ /([\'\"]?)
+		 NAME\1\s*
+		 (=>|,)
+		 \s*
+		 ([\'\"]?)
+		 (\S+)\3/xs) {
 	    # Regular MakeMaker
 	    $name = $4;
-	} elsif ($file =~ /name\(([\'\"]?)(\S+)\1\);/s) {
+	} elsif ($file =~ /name
+		 \s*
+		 \(
+		     ([\'\"]?)
+		         (\S+)
+		     \1
+		 \);/xs) {
 	    # Module::Install syntax
 	    $name = $2;
 	}