From: Raphael Hertzog <hertzog@debian.org>
Date: Mon, 16 Jul 2007 22:47:45 +0000 (+0000)
Subject: * Bugfix: really use /etc/dpkg/shlibs.default
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33cef2fdb199fb486ea9eae40978691ded293fd3;p=dpkg

* Bugfix: really use /etc/dpkg/shlibs.default
* Improvement: only look for debian/*/DEBIAN/{symbols,shlibs} instead of looking into subdirectories as well. File::Find is no more needed.
---

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 0163d494..1f3a40e3 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -43,12 +43,8 @@ my $debug= 0;
 
 my (@pkg_shlibs, @pkg_symbols);
 if (-d "debian") {
-    find sub {
-	push @pkg_shlibs, $File::Find::name
-	    if ($File::Find::name =~ m{/DEBIAN/shlibs$});
-	push @pkg_symbols, $File::Find::name
-	    if ($File::Find::name =~ m{/DEBIAN/symbols$});
-    }, "debian";
+    push @pkg_symbols, <debian/*/DEBIAN/symbols>;
+    push @pkg_shlibs, <debian/*/DEBIAN/shlibs>;
 }
 
 my ($stdout, %exec);
@@ -310,7 +306,8 @@ Dependency fields recognised are:
 sub add_shlibs_dep {
     my ($soname, $pkg) = @_;
     foreach my $file ($shlibslocal, $shlibsoverride, @pkg_shlibs,
-			"$admindir/info/$pkg.shlibs")
+			"$admindir/info/$pkg.shlibs",
+			$shlibsdefault)
     {
 	next if not -e $file;
 	my $dep = extract_from_shlibs($soname, $file);