r27244 - /trunk/dh-make-perl/dh-make-perl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Nov 24 12:20:15 2008
New Revision: 27244

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27244
Log:
brown paperbag: fix mis-merges

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

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=27244&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Mon Nov 24 12:20:15 2008
@@ -179,6 +179,8 @@
     $desc = '';
 }
 
+if ( $opts{refresh} )
+{
     print "Engaging refresh mode\n";
     $maindir = '.';
 
@@ -246,7 +248,6 @@
 
 $bdependsi = join( ', ', $bdependsi||(), $opts{bdependsi}||() );
 
-else {
 $depends .= ', ${shlibs:Depends}' if $arch eq 'any';
 $depends .= ', ${misc:Depends}';
 my $extradeps = extract_depends( $maindir, $meta );
@@ -716,7 +717,7 @@
 }
 
 sub extract_desc {
-    my ( $file, $parser );
+    my ( $file, $parser, $modulename );
     $file   = shift;
     $parser = new MyPod;
     return unless -f $file;
@@ -752,11 +753,11 @@
             = $parser->get('DESCRIPTION')
             || $parser->get('DETAILS')
             || $desc;
-		($modulename = $perlname) =~ s/-/::/g;
-		$longdesc =~ s/This module/$modulename/;
-		
-		local($Text::Wrap::columns) = 78;
-		$longdesc = fill("", "", $longdesc);
+        ( $modulename = $perlname ) =~ s/-/::/g;
+        $longdesc =~ s/This module/$modulename/;
+
+        local($Text::Wrap::columns) = 78;
+        $longdesc = fill( "", "", $longdesc );
     }
     if ( defined $longdesc && $longdesc !~ /^$/ ) {
         $longdesc =~ s/^\s+//s;
@@ -1376,7 +1377,7 @@
         # mind that many licenses are not meant to be used as
         # templates (i.e. you must add the author name and some
         # information within the licensing text as such).
-        if (   $meta && $meta->{license} =~ /perl/i
+        if (   $meta and $meta->{license} and $meta->{license} =~ /perl/i
             or $mangle_cprt =~ /terms\s*as\s*Perl\s*itself/is )
         {
             push @res, "License-Alias: Perl";