r27292 - /trunk/dh-make-perl/dh-make-perl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Nov 26 10:41:58 2008
New Revision: 27292

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27292
Log:
add detected run-time dependencies to 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=27292&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Wed Nov 26 10:41:58 2008
@@ -406,6 +406,13 @@
     homedir => $homedir,
 });
 
+$depends .= ', ${shlibs:Depends}' if $arch eq 'any';
+$depends .= ', ${misc:Depends}';
+my $extradeps = extract_depends( $maindir, $apt_contents, 0 );
+
+$depends
+    = join( ', ', $depends || (), $opts{depends} || (), $extradeps || (), );
+
 
 $module_build = ( -f "$maindir/Build.PL" ) ? "Module-Build" : "MakeMaker";
 extract_changelog($maindir);
@@ -416,10 +423,18 @@
 
 my ( $extrabdepends, $extrabdependsi );
 if ( $arch eq 'any' ) {
-    $extrabdepends = extract_depends( $maindir, $apt_contents, 1 );
+    $extrabdepends = join(
+        ', ',
+        extract_depends( $maindir, $apt_contents, 1 ) || (),
+        $extradeps || (),
+    );
 }
 else {
-    $extrabdependsi = extract_depends( $maindir, $apt_contents, 1 );
+    $extrabdependsi = join(
+        ', ',
+        extract_depends( $maindir, $apt_contents, 1 ) || (),
+        $extradeps || (),
+    );
 }
 
 $bdepends = join( ', ',
@@ -433,13 +448,6 @@
     $opts{bdependsi} || (),
     $extrabdependsi || (),
 );
-
-$depends .= ', ${shlibs:Depends}' if $arch eq 'any';
-$depends .= ', ${misc:Depends}';
-my $extradeps = extract_depends( $maindir, $apt_contents, 0 );
-
-$depends
-    = join( ', ', $depends || (), $opts{depends} || (), $extradeps || (), );
 
 apply_overrides();