[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.15.22-3-g92f6367

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=92f6367

The following commit has been merged in the master branch:
commit 92f63673170d6f230e78c9f9f862099704821db7
Author: Pino Toscano <pino at debian.org>
Date:   Sat Aug 27 09:45:54 2016 +0200

    dh_sodeps: work also for libs in multiarch dir
---
 debian/changelog | 1 +
 dh_sodeps        | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9b1b63..430892e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pkg-kde-tools (0.15.23) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Add myself to Uploaders.
+  * dh_sodeps: make it work also for libraries in the multiarch directory.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Aug 2016 09:34:05 +0200
 
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);
                 }
             }

-- 
Debian Qt/KDE packaging tools