From 11fb3eaf6085bb508bfdb265e5b309fb314e5d55 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 2 Jun 2006 03:52:05 +0000 Subject: [PATCH] Add '/lib32' and '/usr/lib32' to the dpkg-shlibdeps library path search list. Closes: #367892 --- ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/dpkg-shlibdeps.pl | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6b57dab9..cf39c4d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Guillem Jover + + * scripts/dpkg-shlibdeps.pl (@librarypaths): Add '/lib32' and + '/usr/lib32/'. + 2006-06-02 Guillem Jover * src/query.c (setaction): Print also the short command line action. diff --git a/debian/changelog b/debian/changelog index a2b87453..4c4dc3d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ dpkg (1.13.21~) UNRELEASED; urgency=low * Disambiguate error message about conflicting command line actions by providing both long and short option names. Based on a suggestion by Josip Rodin. Closes: #45575 + * Add '/lib32' and '/usr/lib32' to the dpkg-shlibdeps library path search + list. Closes: #367892 -- Guillem Jover Wed, 31 May 2006 08:03:11 +0300 diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 3126b819..8ae77db4 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -121,7 +121,7 @@ sub isbin { } } -my @librarypaths = qw( /lib /usr/lib /lib64 /usr/lib64 ); +my @librarypaths = qw( /lib /usr/lib /lib32 /usr/lib32 /lib64 /usr/lib64 ); my %librarypaths = map { $_ => 'default' } @librarypaths; if ($ENV{LD_LIBRARY_PATH}) { -- 2.39.5