r28068 - in /trunk/dh-make-perl/lib: Debian/Dependency.pm DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Dec 11 14:27:03 2008
New Revision: 28068

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28068
Log:
drop Dependency::parse_list and replace it with Dependencies->new

Modified:
    trunk/dh-make-perl/lib/Debian/Dependency.pm
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/lib/Debian/Dependency.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/Debian/Dependency.pm?rev=28068&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/Dependency.pm (original)
+++ trunk/dh-make-perl/lib/Debian/Dependency.pm Thu Dec 11 14:27:03 2008
@@ -22,13 +22,6 @@
 
    # stringification
    print "$d"      # 'perl (>= 5.10)'
-
-   # parsing lists
-   my @list = Dep->parse_list( 'perl (>= 5.10), libc (>= 2.7)' );
-   print $list[0]->ver;    # '5.10'
-
-                                                       # <= relationship
-   my @list = Dep->parse_list( 'perl (<= 5.11)' );     # UNSUPPORTED
 
 =cut
 
@@ -101,24 +94,6 @@
     }
 }
 
-sub parse_list {
-    my $class = shift;
-    my @list = split( /\s*,\s*/, shift );
-
-    for( @list ) {
-        if ( /(^S+)\s(.+)$/ ) {
-            my ( $pkg, $ver ) = ( $1, $2 );
-            $ver =~ s/^>=\s*//
-                or die "$_: only '>=' relationships are supported";
-            $_ = $class->new( $pkg, $ver );
-        }
-        else {
-            $_ = $class->new($_);
-        }
-    }
-
-    return @list;
-}
 
 1;
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=28068&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Thu Dec 11 14:27:03 2008
@@ -44,6 +44,8 @@
 use Text::Wrap;
 use Module::CoreList ();
 use AptPkg::Config;
+use Debian::Dependency;
+use Debian::Dependencies;
 
 # TODO:
 # * get more info from the package (maybe using CPAN methods)
@@ -249,7 +251,7 @@
     push @depends, Debian::Dependency->new('${misc:Depends}');
     my $extradeps = extract_depends( $maindir, $apt_contents, 0 );
     push @depends, @$extradeps;
-    push @depends, Debian::Dependency->parse_list($opt_depends) if $opt_depends;
+    push @depends, Debian::Dependencies->new($opt_depends) if $opt_depends;
 
     $module_build = ( -f "$maindir/Build.PL" ) ? "Module-Build" : "MakeMaker";
     extract_changelog($maindir);
@@ -273,10 +275,10 @@
         );
     }
 
-    push @bdepends, Debian::Dependency->parse_list($opt_bdepends) if $opt_bdepends;
+    push @bdepends, Debian::Dependencies->new($opt_bdepends) if $opt_bdepends;
     push @bdepends, @extrabdepends;
 
-    push @bdependsi, Debian::Dependency->parse_list($opt_bdependsi) if $opt_bdependsi;
+    push @bdependsi, Debian::Dependencies->new($opt_bdependsi) if $opt_bdependsi;
     push @bdependsi, @extrabdependsi;
 
     apply_overrides();
@@ -1503,13 +1505,13 @@
     $priority = $val
         if (
         defined( $val = get_override_val( $data, $subkey, 'priority' ) ) );
-    @depends = Debian::Dependency->parse_list($val)
+    @depends = Debian::Dependencies->new($val)
         if (
         defined( $val = get_override_val( $data, $subkey, 'depends' ) ) );
-    @bdepends = Debian::Dependency->parse_list($val)
+    @bdepends = Debian::Dependencies->new($val)
         if (
         defined( $val = get_override_val( $data, $subkey, 'bdepends' ) ) );
-    @bdependsi = Debian::Dependency->parse_list($val)
+    @bdependsi = Debian::Dependencies->new($val)
         if (
         defined( $val = get_override_val( $data, $subkey, 'bdependsi' ) ) );
     $desc = $val