[SCM] Debian packaging of dh-make-perl branch, master, updated. debian/0.75-1-19-g2230bf9

Damyan Ivanov dmn at debian.org
Tue Apr 24 05:20:51 UTC 2012


The following commit has been merged in the master branch:
commit 2230bf9b155a82f03286a3e4b05169e5c144a170
Author: Damyan Ivanov <dmn at debian.org>
Date:   Tue Apr 24 08:20:12 2012 +0300

    make --version override any detected version

diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index f078ee3..0d23792 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -336,18 +336,17 @@ sub extract_name_ver {
             else {
                 die "Unable to determine dist name, no Build.PL, no Makefile.PL\nPlease use --cpan.\n";
             }
-
-            if ( $self->cfg->version ) {
-                $self->version( $self->cfg->version );
-            }
-            else {
-                die "Unable to determine dist version, no Build.PL, no Makefile.PL\nPlease use --version.\n";
-            }
         }
         $name = $self->perlname;
         $ver  = $self->version;
     }
 
+    $ver = $self->cfg->version
+        if $self->cfg->version;
+
+    defined($ver) and $ver ne ''
+        or die "Unable to determine dist version\. Please use --version.\n";
+
     # final sanitazing of name and version
     $name =~ s/::/-/g;
     $ver = $self->sanitize_version($ver);

-- 
Debian packaging of dh-make-perl



More information about the Pkg-perl-cvs-commits mailing list