r59405 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl/Utils.pm

[chrisb at users.alioth.debian.org]

Author: chrisb
Date: Mon Jun 14 19:14:10 2010
New Revision: 59405

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59405
Log:
Fixed DhMakePerl::Utils to cope with modules in Module::CoreList where the
version is unspecified. (Closes: #585755)

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl/Utils.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=59405&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Mon Jun 14 19:14:10 2010
@@ -17,6 +17,10 @@
   [ Salvatore Bonaccorso ]
   * Add support of Breaks field for binary package stanzas in debian/control
     to Debian::Control::Stanza::Binary.
+
+  [ Chris Butler ]
+  * Fixed DhMakePerl::Utils to cope with modules in Module::CoreList where the
+    version is unspecified. (Closes: #585755)
 
  -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Wed, 02 Jun 2010 12:42:21 +0200
 

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=59405&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Utils.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Utils.pm Mon Jun 14 19:14:10 2010
@@ -143,12 +143,16 @@
     for my $v(
         sort keys %Module::CoreList::version ){
 
+        # Module::CoreList::version includes families (i.e. "5") as well as
+        # full versions, skip the families.
+        next unless ($v =~ /^\d+\.\d+(?:\.|$)/);
+
         next unless exists $Module::CoreList::version{$v}{$module};
 
         my $found = $Module::CoreList::version{$v}{$module};
 
         push @ret, $v
-            if not defined($version)
+            if not $version
                 or $found and version->new($found) >= $version;
     }