r26997 - in /trunk/dh-make-perl: debian/changelog dh-make-perl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Nov 18 06:53:35 2008
New Revision: 26997

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26997
Log:
Make --depends and similar options to add packages to dependencies instead
of replacing the detected dependecy lists.
Closes: #487850 -- allow adding, not overwriting dependencies with
--depends and friends

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

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=26997&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue Nov 18 06:53:35 2008
@@ -5,6 +5,10 @@
   * Make parentheses around module name optional in the Module::Install-using
     Makefile.PL. Closes: #493652 -- Fails to detect name
     Thanks to Christ West (Faux) for the report and the patch
+  * Make --depends and similar options to add packages to dependencies instead
+    of replacing the detected dependecy lists.
+    Closes: #487850 -- allow adding, not overwriting dependencies with
+                       --depends and friends
 
   [ Gunnar Wolf ]
   * Now creates machine-parsable debian/copyright files (cf.

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=26997&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Tue Nov 18 06:53:35 2008
@@ -218,21 +218,22 @@
 extract_docs($maindir);
 extract_examples($maindir);
 
-if (defined $opts{bdepends}) {
-    $bdepends = $opts{bdepends};
-} else {
-    $bdepends .= ', libmodule-build-perl' if ($module_build eq "Module-Build");
-}
-$bdependsi = $opts{bdependsi} if defined $opts{bdependsi};
-
-if (defined $opts{depends}) {
-    $depends = $opts{depends};
-} else {
-    $depends .= ', ${shlibs:Depends}' if $arch eq 'any';
-    $depends .= ', ${misc:Depends}';
-    my $extradeps = extract_depends($maindir, $meta);
-    $depends .= ( $extradeps ? ", $extradeps" : '' );
-}
+$bdepends .= ', libmodule-build-perl' if ($module_build eq "Module-Build");
+$bdepends = join(', ', $bdepends||(), $opts{bdepends}||());
+
+$bdependsi = join(', ', $bdependsi||(), $opts{bdependsi}||());
+
+$depends .= ', ${shlibs:Depends}' if $arch eq 'any';
+$depends .= ', ${misc:Depends}';
+my $extradeps = extract_depends($maindir, $meta);
+$depends .= ( $extradeps ? ", $extradeps" : '' );
+
+$depends = join(
+    ', ',
+    $depends||(),
+    $opts{depends}||(),
+    $extradeps||(),
+);
 
 apply_overrides();