make dpkg-shlibdeps really do what the manpage says it does

diff --git a/ChangeLog b/ChangeLog
index 6435ee78d379bfe2d0c9c5e95e4635244e886ede..f48df71a42ba12e130e7ea3bfe1c0e3e2df022e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep  9 21:17:37 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-shlibdeps.pl: really make it do what the documentation
+    says it does.
+
 Fri Sep  8 12:28:34 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * configure.in: add de to ALL_LINGUAS
@@ -7,6 +12,10 @@ Fri Sep  8 12:28:34 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
   * scripts/dpkg-divert.pl: change $dpkglibdir to $admindir
   * scripts/Makefile.in: set $admindir as well in scripts
 
+Tue Sep  5 20:28:17 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-source.1: note that dpkg-shlibdeps uses objdump now
+
 Sat Sep  2 18:29:56 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * archtable, scripts/dpkg-architecture.pl: add entries for SuperH
@@ -106,7 +115,7 @@ Thu Jun 15 13:41:28 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
     + initialize dop->backrev as well when creating new dependency
     + only allow exact version relations when dealing with provides
   * TODO: remove versioned provides
-  * debian/rules: don't fail of make clean fails (which happens on a
+  * debian/rules: don't fail if make clean fails (which happens on a
     cvsclean tree)
 
 Thu Jun 15 10:09:03 EDT 2000 Ben Collins <bcollins@debian.org>
@@ -355,7 +364,7 @@ Mon Jan 17 21:20:35 CET 2000 Wichert Akkerman <wakkerma@debian.org>
   * scripts/dpkg-shlibdeps.pl: update to version from dpkg_test_bz2_syslog_sigs
     branch:
     + use objdump instead of ldd
-       + correct checks on shlibs.local
+    + correct checks on shlibs.local
 
 Sun Jan 16 22:07:12 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 7f4cb88e5f515142c6199b6a3d23dc7d385e8fdf..e90926ef68af06a57fb25ec91a3ad76db6ef5464 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -196,10 +196,9 @@ sub scanshlibsfile {
     $fn= "./$fn" if $fn =~ m/^\s/;
     if (!open(SLF,"< $fn")) {
         $! == ENOENT || syserr("unable to open shared libs info file \`$fn'");
-#print STDERR "scanshlibsfile($fn,$ln,$lsn,$lf) ... ENOENT\n";
         return 0;
     }
-#print STDERR "scanshlibsfile($fn,$ln,$lsn,$lf) ...\n";
+
     while (<SLF>) {
         s/\s*\n$//; next if m/^\#/;
         if (!m/^\s*(\S+)\s+(\S+)/) {

diff --git a/scripts/dpkg-source.1 b/scripts/dpkg-source.1
index be969dd34885dabff63e13401270a8e40e4ed811..18e08c517fff825dbb13e3a98ba0a448db25cf9a 100644 (file)
--- a/scripts/dpkg-source.1
+++ b/scripts/dpkg-source.1
@@ -58,7 +58,7 @@ will read shared library dependency information from
 the
 .B shlibs
 control area file of the package containing the file which
-.B ldd
+.B objdump
 reports as satisfying the library dependency, or
 .BR /etc/dpkg/shlibs.default .
 The first match will be used.  See the