r53113 - /trunk/dh-make-perl/lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sat Feb 20 21:23:25 2010
New Revision: 53113

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53113
Log:
drop $modulepm package lexical

Modified:
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=53113&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Sat Feb 20 21:23:25 2010
@@ -108,7 +108,6 @@
 # If we're being required rather than called as a main command, then
 # return now without doing any work.  This facilitates easier testing.
 
-my ( $modulepm );
 my (
     $desc, $longdesc, $copyright, $author, $upsurl
 );
@@ -692,9 +691,6 @@
     $upsurl = sprintf( "http://search.cpan.org/dist/%s/", $self->perlname );
 
     $copyright = $self->extract_basic_copyright();
-    if ($modulepm) {
-        $self->extract_desc($modulepm);
-    }
 
     find(
         sub {
@@ -860,8 +856,6 @@
 
     $dir = dirname($makefile) || './';
 
-    $modulepm = "$dir/$vfrom" if defined $vfrom;
-
     for ( ( $name, $ver ) ) {
         next unless defined;
         next unless /^\$/;
@@ -909,6 +903,8 @@
 
     $self->perlname($name);
     $self->version($ver);
+
+    $self->extract_desc("$dir/$vfrom") if defined $vfrom;
 }
 
 sub extract_desc {