r6238 - in /trunk/dh-make-perl: debian/changelog dh-make-perl

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

Author: gregoa-guest
Date: Fri Aug  3 18:10:07 2007
New Revision: 6238

URL: http://svn.debian.org/wsvn/?sc=1&rev=6238
Log:
* Define $dir before using it in "$modulepm =" in
  extract_name_ver_from_makefile().
* Replace q[quotes] by "quotes" when parsing Makefile.PL in
  extract_name_ver_from_makefile().

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

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/debian/changelog?rev=6238&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Fri Aug  3 18:10:07 2007
@@ -10,6 +10,10 @@
   [ gregor herrmann ]
   * Add "It was downloaded from ..." to debian/copyright if called with
     "--cpan $modulename".
+  * Define $dir before using it in "$modulepm =" in
+    extract_name_ver_from_makefile().
+  * Replace q[quotes] by "quotes" when parsing Makefile.PL in
+    extract_name_ver_from_makefile().
 
   [ Damyan Ivanov ]
   * Added packaging copyright/licensing to the generated debian/copyright
@@ -18,7 +22,7 @@
   * Add detailed copyright info in debian/copyright according to SVN logs and
     debian/changelog
 
- -- Damyan Ivanov <dmn at debian.org>  Thu, 02 Aug 2007 09:13:57 +0300
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Fri, 03 Aug 2007 20:08:03 +0200
 
 dh-make-perl (0.26) unstable; urgency=low
 

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/dh-make-perl?rev=6238&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Fri Aug  3 18:10:07 2007
@@ -470,6 +470,9 @@
 	    $file = $fh->getline;
 	}
 
+	# Replace q[quotes] by "quotes"
+	$file =~ s/q\[(.+)]/"$1"/g;
+
 	# Get the name
 	if ($file =~ /([\'\"]?)
 	    DISTNAME\1\s*
@@ -524,9 +527,9 @@
 	    $ver = $1;
 	}
 
+	$dir = dirname($makefile) || './';
+
 	$modulepm = "$dir/$vfrom" if defined $vfrom;
-
-	$dir = dirname($makefile) || './';
 
 	for (($name, $ver)) {
 		next unless defined;