From: Ben Collins <bcollins@debian.org>
Date: Thu, 28 Oct 1999 14:08:13 +0000 (+0000)
Subject:   * dpkg-shlibdeps: fix ordering for shlibs.default
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93bfad764ec5f8c0cd3dd3f02a37ecda464fa03b;p=dpkg

  * dpkg-shlibdeps: fix ordering for shlibs.default
---

diff --git a/ChangeLog b/ChangeLog
index 573e0156..3aecff7d 100644
--- 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 681df3e4..aceb736f 100644
--- 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 ded32460..e37e4d5a 100755
--- 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;
-	}
     }
 }