* 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 0163d49405d9707027c38f81370edba292e819d2..1f3a40e31fadb5c3908a18cbb73f1e7da3c8d284 100755 (executable)
--- 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);