Author: guillem
Date: 2006-04-09 19:31:47 +0000 (Sun, 09 Apr 2006)
New Revision: 221
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-shlibdeps.pl
Log:
Support system library directories in dpkg-shlibdeps symlinked from
'/lib/ldconfig'. Closes: #356452
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-04-09 18:13:21 UTC (rev 220)
+++ trunk/ChangeLog 2006-04-09 19:31:47 UTC (rev 221)
@@ -1,4 +1,9 @@
-2006-04-04 Branden Robinson <[EMAIL PROTECTED]>,
+2006-04-09 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-shlibdeps.pl: Support system library directories
+ symlinked from '/lib/ldconfig/'.
+
+2006-04-09 Branden Robinson <[EMAIL PROTECTED]>,
Guillem Jover <[EMAIL PROTECTED]>
* src/main.c (execbackend): Pass '--admindir' over to dpkg-query
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-04-09 18:13:21 UTC (rev 220)
+++ trunk/debian/changelog 2006-04-09 19:31:47 UTC (rev 221)
@@ -34,6 +34,8 @@
* Pass '--admindir' option over to dpkg-query when passing '--admindir' or
'--root' to dpkg (initial patch by Branden Robinson).
Closes: #153305, #271041, #282853, #307715, #355915
+ * Support system library directories in dpkg-shlibdeps symlinked from
+ '/lib/ldconfig'. Closes: #356452
[ Christian Perrier ]
*
Modified: trunk/scripts/dpkg-shlibdeps.pl
===================================================================
--- trunk/scripts/dpkg-shlibdeps.pl 2006-04-09 18:13:21 UTC (rev 220)
+++ trunk/scripts/dpkg-shlibdeps.pl 2006-04-09 19:31:47 UTC (rev 221)
@@ -117,6 +117,23 @@
}
}
+# Support system library directories.
+my $ldconfigdir = '/lib/ldconfig';
+if (opendir(DIR, $ldconfigdir)) {
+ my @dirents = readdir(DIR);
+ closedir(DIR);
+
+ for (@dirents) {
+ next if /^\./;
+ my $d = `readlink -f $ldconfigdir/$_`;
+ chomp $d;
+ unless (exists $librarypaths{$d}) {
+ $librarypaths{$d} = 'ldconfig';
+ push @librarypaths, $d;
+ }
+ }
+}
+
open CONF, '</etc/ld.so.conf' or
warn( "couldn't open /etc/ld.so.conf: $!" );
while( <CONF> ) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
