r55700 - in /trunk/dh-make-perl: lib/Debian/Control/FromCPAN.pm t/perl-versions.t

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Apr  8 05:12:31 2010
New Revision: 55700

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55700
Log:
FromCPAN/nice_perl_ver fixed for '5.9.1' and the like

Two dots are taken to indicate a version that is already nice

Modified:
    trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm
    trunk/dh-make-perl/t/perl-versions.t

Modified: trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm?rev=55700&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm (original)
+++ trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm Thu Apr  8 05:12:31 2010
@@ -476,7 +476,7 @@
 sub nice_perl_ver {
     my( $self, $v ) = @_;
 
-    if( $v =~ /\.(\d+)$/ ) {
+    if( $v =~ /\.(\d+)$/ and $v !~ /\..+\./ ) { # do nothing for 5.9.1
         my $minor = $1;
         if( length($minor) % 3 ) {
             # right-pad with zeroes so that the number of digits after the dot

Modified: trunk/dh-make-perl/t/perl-versions.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/perl-versions.t?rev=55700&op=diff
==============================================================================
--- trunk/dh-make-perl/t/perl-versions.t (original)
+++ trunk/dh-make-perl/t/perl-versions.t Thu Apr  8 05:12:31 2010
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 21;
+use Test::More tests => 22;
 
 BEGIN {
     use_ok('Debian::Control::FromCPAN');
@@ -35,3 +35,5 @@
 check( '5.009005', '5.9.5' );
 check( '5.01'    , '5.10'  );
 check( '5.010000', '5.10.0');
+
+check( '5.9.1', '5.9.1' );