r57538 - in /trunk/dh-make-perl: Changes TODO debian/changelog lib/DhMakePerl.pm lib/DhMakePerl/Command/Packaging.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed May  5 19:46:14 2010
New Revision: 57538

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57538
Log:
die early if unable to determine distribution name or version

Probably Closes: #525847 (already closed due to missing test case)

Modified:
    trunk/dh-make-perl/Changes
    trunk/dh-make-perl/TODO
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl.pm
    trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm

Modified: trunk/dh-make-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/Changes?rev=57538&op=diff
==============================================================================
--- trunk/dh-make-perl/Changes (original)
+++ trunk/dh-make-perl/Changes Wed May  5 19:46:14 2010
@@ -1,3 +1,8 @@
+0.69 (NOT RELEASES YET)
+
+    die early if unable to determine distribution name or version.
+        Debian bug #525847
+
 0.68 (2010-05-04)
 
     Build.PL: add no_index as an attempt to avoid PAUSE indexing private stuff

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=57538&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Wed May  5 19:46:14 2010
@@ -1,5 +1,3 @@
-* --refresh on MIME-Charset 1.007 can't detect the dist name and cries.
-  May be similar to #525847
 * when ITP for the package is found, try to deduce short/long description from
   the bug report
 * versioned dependencies should add the epochs too (found in

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=57538&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Wed May  5 19:46:14 2010
@@ -1,3 +1,10 @@
+dh-make-perl (0.69-1) UNRELEASED; urgency=low
+
+  * die early if unable to determine distribution name or version.
+    Probably Closes: #525847 (already closed due to missing test case)
+
+ -- Damyan Ivanov <dmn at debian.org>  Wed, 05 May 2010 08:40:51 +0300
+
 dh-make-perl (0.68-1) unstable; urgency=low
 
   * make: fix a typo (DpkgList -> DpkgLists). Thanks to Dominic Hargreaves

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=57538&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Wed May  5 19:46:14 2010
@@ -18,7 +18,7 @@
 
 =cut
 
-our $VERSION = '0.68';
+our $VERSION = '0.69';
 
 =head1 SYNOPSIS
 

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm?rev=57538&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Wed May  5 19:46:14 2010
@@ -307,6 +307,14 @@
     $ver = "0$ver" unless $ver =~ /^\d/;
 
     $name =~ s/::/-/g;
+
+    $name
+        or $ver
+        or die
+        "Unable to determine distribution name and version. Aborting.\n";
+
+    $name or die "Unable to determine distribution name. Aborting.\n";
+    $ver  or die "Unable to determine distribution version. Aborting.\n";
 
     $self->perlname($name);
     $self->version($ver);