r27291 - /trunk/dh-make-perl/dh-make-perl

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Wed Nov 26 10:41:53 UTC 2008


Author: dmn
Date: Wed Nov 26 10:41:50 2008
New Revision: 27291

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27291
Log:
extract also build-time dependencies

Modified:
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=27291&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Wed Nov 26 10:41:50 2008
@@ -413,13 +413,30 @@
 extract_examples($maindir);
 
 $bdepends .= ', libmodule-build-perl' if ( $module_build eq "Module-Build" );
-$bdepends = join( ', ', $bdepends || (), $opts{bdepends} || () );
-
-$bdependsi = join( ', ', $bdependsi || (), $opts{bdependsi} || () );
+
+my ( $extrabdepends, $extrabdependsi );
+if ( $arch eq 'any' ) {
+    $extrabdepends = extract_depends( $maindir, $apt_contents, 1 );
+}
+else {
+    $extrabdependsi = extract_depends( $maindir, $apt_contents, 1 );
+}
+
+$bdepends = join( ', ',
+    $bdepends || (),
+    $opts{bdepends} || (),
+    $extrabdepends || (),
+);
+
+$bdependsi 	= join( ', ',
+    $bdependsi || (),
+    $opts{bdependsi} || (),
+    $extrabdependsi || (),
+);
 
 $depends .= ', ${shlibs:Depends}' if $arch eq 'any';
 $depends .= ', ${misc:Depends}';
-my $extradeps = extract_depends( $maindir, $apt_contents );
+my $extradeps = extract_depends( $maindir, $apt_contents, 0 );
 
 $depends
     = join( ', ', $depends || (), $opts{depends} || (), $extradeps || (), );




More information about the Pkg-perl-cvs-commits mailing list