r53279 - /trunk/dh-make-perl/lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Feb 23 20:15:45 2010
New Revision: 53279

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53279
Log:
decouple dh --with version requirements from the --with arguments

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

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=53279&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Tue Feb 23 20:15:45 2010
@@ -2258,25 +2258,18 @@
 
     my $rules = $self->_file_r( $self->debian_file('rules') );
     while ( defined( $_ = <$rules> ) ) {
+        $self->explained_dependency( 'dh --with', $deps,
+            'debhelper (>= 7.0.8)' )
+            if /dh \s+.*--with/;
+
         $self->explained_dependency(
-            'dh -with=quilt',
-            $deps,
-            'debhelper (>= 7.0.8)',
-            'quilt (>= 0.46-7)',
+            'dh --with=quilt',
+            $deps, 'quilt (>= 0.46-7)',
         ) if /dh\s+.*--with[= ]quilt/;
-        if ( /dh\s+.*--with[= ]bash[-_]completion/ )
-        {
-            $self->explained_dependency(
-                'dh -with=bash-completion',
-                $deps,
-                'debhelper (>= 7.0.8)',
-            );
-            $self->explained_dependency(
-                'dh -with=bash-completion',
-                $depsi,
-                'bash-completion (>= 1:1.0-3)'
-            );
-        }    
+
+        $self->explained_dependency( 'dh -with=bash-completion',
+            $depsi, 'bash-completion (>= 1:1.0-3)' )
+            if (/dh\s+.*--with[= ]bash[-_]completion/);
         $self->explained_dependency( 'override_dh_* target',
             $deps, 'debhelper (>= 7.0.50)' )
             if /^override_dh_/;