Support a colon separated list of paths from the ELF RPATH field in

dpkg-shlibdeps. Thanks to Jiří Paleček. Closes: #427988

diff --git a/ChangeLog b/ChangeLog
index 04f93485b2ba8d141a913252d5f4c736029560d5..b42a8378f3c17a8c0ccfb3eaedbd4d8a9141a2b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-12  Jiří Paleček  <jpalecek@web.de>
+
+       * dpkg-shlibdeps.pl: Support colon separated list of paths in the
+       ELF RPATH field.
+
 2007-06-12  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-scanpackages.pl: Move check for existence of $override

diff --git a/debian/changelog b/debian/changelog
index 74553a3298326f6099054f80a5d88185a3286d32..dfa0e0f58beeef2f77e541c9aba0631dcc507bf4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.14.5) UNRELEASED; urgency=low
     packages information. Closes: #428169, #428470
   * Add '.shelf' to the default dpkg-source -i regex. Closes: #427827
     Thanks to Adeodato Simó.
+  * Support a colon separated list of paths from the ELF RPATH field in
+    dpkg-shlibdeps. Thanks to Jiří Paleček. Closes: #427988
   * Man pages cleanup:
     - Reference deb-substvars(5) instead of dpkg-substvars(5).
     - Mark dpkg-* commands in bold.

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index cbfb03816c375598f41c153711f5a46b6dbf5610..67f45d5abf7f52887930c3dbe9d2e9dfa19f3525 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -209,7 +209,7 @@ for ($i=0;$i<=$#exec;$i++) {
                warning(sprintf(_g("format of 'NEEDED %s' not recognized"), $1));
            }
        } elsif (/^\s*RPATH\s+(\S+)\s*$/) {
-           push @{$rpaths{$exec[$i]}}, $1;
+           push @{$rpaths{$exec[$i]}}, split(/:/, $1);
        }
     }
     close(P) or subprocerr(sprintf(_g("objdump on \`%s'"), $exec[$i]));