Add '/emul/ia32-linux' biarch paths to dpkg-shlibdeps. Closes: #403216

diff --git a/ChangeLog b/ChangeLog
index e7fe0a0453fd9037a3a3c9a53bc2606e9c59b09a..a65d4e10db08747083347be816e020a1014225ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-01  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-shlibdeps.pl (@librarypaths): Add '/emul/ia32-linux/lib'
+       and '/emul/ia32-linux/usr/lib'.
+
 2006-11-24  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-source.pl: Add lzma extracting support.

diff --git a/debian/changelog b/debian/changelog
index 8051ff34737f39ff670728bf872e17900f0b7916..32285ace4dfc9fec59b9460a15c9d02c8a6a976c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ dpkg (1.13.25~) UNRELEASED; urgency=low
     Thanks to Brendan O'Dea <bod@debian.org>.
   * Support extracting lzma compressed source and binary packages,
     and add a Suggests on package lzma. Closes: #347715
+  * Add '/emul/ia32-linux' biarch paths to dpkg-shlibdeps. Closes: #403216
 
   [ Updated dpkg translations ]
   * Chinese (Traditional, Asho Yeh)

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 8ae77db4f300e9f7934b2a2edcd3b39cb917e02e..ff4f4243d76218daf7fb166228c1eede8fa59438 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -121,7 +121,8 @@ sub isbin {
     }
 }
 
-my @librarypaths = qw( /lib /usr/lib /lib32 /usr/lib32 /lib64 /usr/lib64 );
+my @librarypaths = qw( /lib /usr/lib /lib32 /usr/lib32 /lib64 /usr/lib64
+                      /emul/ia32-linux/lib /emul/ia32-linux/usr/lib );
 my %librarypaths = map { $_ => 'default' } @librarypaths;
 
 if ($ENV{LD_LIBRARY_PATH}) {