From 92f63673170d6f230e78c9f9f862099704821db7 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 27 Aug 2016 09:45:54 +0200 Subject: dh_sodeps: work also for libs in multiarch dir --- dh_sodeps | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'dh_sodeps') diff --git a/dh_sodeps b/dh_sodeps index 151e327..acf8a7a 100755 --- a/dh_sodeps +++ b/dh_sodeps @@ -73,7 +73,12 @@ my @packages = getpackages("arch"); foreach my $package (@{$dh{DOPACKAGES}}) { my $tmpdir = tmpdir($package); - my @solinks = grep { -l $_ } glob("$tmpdir/usr/lib/*.so"); + my $globstring = "$tmpdir/usr/lib/*.so"; + my $multiarch = dpkg_architecture_value("DEB_HOST_MULTIARCH"); + if (defined $multiarch) { + $globstring = "$globstring $tmpdir/usr/lib/$multiarch/*.so" + } + my @solinks = grep { -l $_ } glob($globstring); if (@solinks) { my $arch = package_arch($package); @@ -93,7 +98,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $target = readlink($solink); foreach my $p (@packages) { next if $p eq $package; - if (-e "debian/$p/usr/lib/$target") { + if (-e "debian/$p/usr/lib/$target" || (defined $multiarch and -e "debian/$p/usr/lib/$multiarch/$target")) { addsubstvar($package, "so:Depends", $p, $verinfo); } } -- cgit v1.2.3