r56138 - in /trunk/dh-make-perl: lib/DhMakePerl/Utils.pm t/perl-versions.t

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Apr 15 20:30:46 2010
New Revision: 56138

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=56138
Log:
nice_perl_ver: always return three-component version

5.010000 and 0.05 become 5.10.0 (which is what debian has)

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

Modified: trunk/dh-make-perl/lib/DhMakePerl/Utils.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Utils.pm?rev=56138&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Utils.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Utils.pm Thu Apr 15 20:30:46 2010
@@ -109,6 +109,8 @@
             $ver .= '.' . ( 0 + substr( $minor, 3 ) );
         }
         $v =~ s/\.\d+$/.$ver/;
+
+        $v .= '.0' if $v =~ /^\d+\.\d+$/;   # force three-component version
     }
 
     return $v;

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=56138&op=diff
==============================================================================
--- trunk/dh-make-perl/t/perl-versions.t (original)
+++ trunk/dh-make-perl/t/perl-versions.t Thu Apr 15 20:30:46 2010
@@ -17,7 +17,7 @@
 
 check( '5.006002', '5.6.2' );
 check( '5.007003', '5.7.3' );
-check( '5.008'   , '5.8'   );
+check( '5.008'   , '5.8.0' );
 check( '5.008001', '5.8.1' );
 check( '5.008002', '5.8.2' );
 check( '5.008003', '5.8.3' );
@@ -27,13 +27,13 @@
 check( '5.008007', '5.8.7' );
 check( '5.008008', '5.8.8' );
 check( '5.008009', '5.8.9' );
-check( '5.009'   , '5.9'   );
+check( '5.009'   , '5.9.0' );
 check( '5.009001', '5.9.1' );
 check( '5.009002', '5.9.2' );
 check( '5.009003', '5.9.3' );
 check( '5.009004', '5.9.4' );
 check( '5.009005', '5.9.5' );
-check( '5.01'    , '5.10'  );
+check( '5.01'    , '5.10.0');
 check( '5.010000', '5.10.0');
 
 check( '5.9.1', '5.9.1' );