From 5371b8082c6e7ecd9a71c37f92442eaeebe33ebc Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 12 Jun 2007 05:10:22 +0000 Subject: [PATCH] =?utf8?q?Support=20a=20colon=20separated=20list=20of=20pa?= =?utf8?q?ths=20from=20the=20ELF=20RPATH=20field=20in=20dpkg-shlibdeps.=20?= =?utf8?q?Thanks=20to=20Ji=C5=99=C3=AD=20Pale=C4=8Dek.=20Closes:=20#427988?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/dpkg-shlibdeps.pl | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 04f93485..b42a8378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-12 Jiří Paleček + + * dpkg-shlibdeps.pl: Support colon separated list of paths in the + ELF RPATH field. + 2007-06-12 Guillem Jover * scripts/dpkg-scanpackages.pl: Move check for existence of $override diff --git a/debian/changelog b/debian/changelog index 74553a32..dfa0e0f5 100644 --- 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 cbfb0381..67f45d5a 100755 --- 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])); -- 2.39.5