[dh-make-perl-cvs-dev] CVS dh-make-perl

[CVS User gwolf]

Update of /cvsroot/dh-make-perl/dh-make-perl
In directory haydn:/tmp/cvs-serv21689

Modified Files:
	dh-make-perl 
Log Message:
Two simple bugfixes


--- /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl	2005/09/06 21:53:43	1.38
+++ /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl	2005/10/25 14:07:38	1.39
@@ -337,7 +337,7 @@
     }
 
     # Returns a simple hashref with all the keys/values defined in META.yml
-    return {};
+    return $yaml;
 }
 
 sub extract_basic_copyright {
@@ -431,6 +431,10 @@
 	    $vfrom = $4 if 
 		$file =~ /([\'\"]?)VERSION_FROM\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s;
 
+	} elsif ($file =~ /([\'\"]?)VERSION_FROM\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s) {
+	    # Regular MakeMaker pointing to where the version is taken from
+	    $vfrom = $4;
+
 	} elsif ($file =~ /version\((\S+)\)/s) {
 	    # Module::Install
 	    $ver = $1;