* dpkg-shlibdeps: fix ordering for shlibs.default

diff --git a/ChangeLog b/ChangeLog
index 573e0156998b1a7475a11405bf37aece15fa6ce9..3aecff7dd0c779da4a15ff917594adc727dd7fba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 28 10:10:23 EDT 1999 Ben Collins <bcollins.debian.org>
+
+  * dpkg-shlibdeps: fix ordering for shlibs.default
+
 Wed Oct 27 21:33:19 EDT 1999 Ben Collins <bcollins.debian.org>
 
   * release.sh: remove attic/ and doc/obsolete/

diff --git a/debian/changelog b/debian/changelog
index 681df3e41c51357d3d841077e83b33d1f1b6c610..aceb736fef9afb3cf63d0e1812b5f353ad1800d2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,7 +38,7 @@ dpkg (1.4.1.19) unstable; urgency=low
     error reporting. Also corrected checks on shlibs.local, which wasn't
     really being parsed, it now works as advertised.
   * dpkg-gencontrol: add "Source" to the fields placed in the control file
-  * dpkg-parsechangelog: fixed loop for parsepath
+  * dpkg-parsechangelog: fixed loop for parsepath (#48526)
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index ded324606d47b3c1cb3822c4ea702125a66eb718..e37e4d5adf530d5d39e059dffb407496f8ba1f98 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -129,6 +129,15 @@ if ($searchdir =~ m,/,) {
 
 if ($#curshlibs >= 0) {
     PRELIB: for ($i=0;$i<=$#libname;$i++) {
+       if(scanshlibsfile($shlibsdefault,$libname[$i],$libsoname[$i],$libf[$i])
+           || scanshlibsfile($shlibsoverride,$libname[$i],$libsoname[$i],$libf[$i])) {
+           splice(@libname, $i, 1);
+           splice(@libsoname, $i, 1);
+           splice(@libf, $i, 1);
+           splice(@libfiles, $i, 1);
+           $i--;
+           next PRELIB;
+       }
        for my $shlibsfile (@curshlibs) {
            if(scanshlibsfile($shlibsfile, $libname[$i], $libsoname[$i], $libf[$i])) {
                splice(@libname, $i, 1);
@@ -139,15 +148,6 @@ if ($#curshlibs >= 0) {
                next PRELIB;
            }
        }
-       if(scanshlibsfile($shlibsdefault,$libname[$i],$libsoname[$i],$libf[$i])
-           || scanshlibsfile($shlibsoverride,$libname[$i],$libsoname[$i],$libf[$i])) {
-           splice(@libname, $i, 1);
-           splice(@libsoname, $i, 1);
-           splice(@libf, $i, 1);
-           splice(@libfiles, $i, 1);
-           $i--;
-           next PRELIB;
-       }
     }
 }