[Reproducible-commits] [debhelper] 35/56: dh_shlibdeps: Accept -L multiple times
Mattia Rizzolo
mattia at mapreri.org
Sun Oct 4 17:06:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
mapreri-guest pushed a commit to branch master
in repository debhelper.
commit 33f5cfb3597b80a584eaf62ed5cf1ab6ec04fdea
Author: Niels Thykier <niels at thykier.net>
Date: Sun Sep 6 09:38:28 2015 +0200
dh_shlibdeps: Accept -L multiple times
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debian/changelog | 3 +++
dh_shlibdeps | 13 ++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab867af..52f6e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,9 @@ debhelper (9.20150811+unreleased) UNRELEASED; urgency=medium
maintainer script snippets into a maintainer script
written in Perl. Thanks to Jakub Wilk for reporting the
issues. (Closes: #797904)
+ * dh_shlibdeps: The "-L" option can now be passed multiple
+ times with different package names. Thanks to Tristan
+ Schmelcher for the suggestion. (Closes: #776103)
[ Paul Tagliamonte ]
* dh_gencontrol: Put debug debs back in the "debug" section.
diff --git a/dh_shlibdeps b/dh_shlibdeps
index c47bd15..614f681 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -66,6 +66,9 @@ It tells B<dpkg-shlibdeps> (via its B<-S> parameter) to look first in the packag
build directory for the specified package, when searching for libraries,
symbol files, and shlibs files.
+If needed, this can be passed multiple times with different package
+names.
+
=back
=head1 EXAMPLES
@@ -91,9 +94,9 @@ on libbar1 as follows:
=cut
init(options => {
- "L|libpackage=s" => \$dh{LIBPACKAGE},
- "dpkg-shlibdeps-params=s", => \$dh{U_PARAMS},
- "l=s", => \$dh{L_PARAMS},
+ "L|libpackage=s@" => \$dh{LIBPACKAGE},
+ "dpkg-shlibdeps-params=s" => \$dh{U_PARAMS},
+ "l=s" => \$dh{L_PARAMS},
});
if (defined $dh{V_FLAG}) {
@@ -131,8 +134,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (@filelist) {
my @opts;
- if (defined $dh{LIBPACKAGE} && length $dh{LIBPACKAGE}) {
- @opts=("-S".tmpdir($dh{LIBPACKAGE}));
+ if (defined($dh{LIBPACKAGE})) {
+ @opts = map { '-S' . tmpdir($_) } @{$dh{LIBPACKAGE}};
}
push @opts, "-tudeb" if is_udeb($package);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git
More information about the Reproducible-commits
mailing list