Преглед изворни кода

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

Wichert Akkerman пре 26 година
родитељ
комит
df7ee51fb8
3 измењених фајлова са 13 додато и 5 уклоњено
  1. 11 2
      ChangeLog
  2. 1 2
      scripts/dpkg-shlibdeps.pl
  3. 1 1
      scripts/dpkg-source.1

+ 11 - 2
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>
 Fri Sep  8 12:28:34 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
 
   * configure.in: add de to ALL_LINGUAS
   * 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/dpkg-divert.pl: change $dpkglibdir to $admindir
   * scripts/Makefile.in: set $admindir as well in scripts
   * 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>
 Sat Sep  2 18:29:56 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
 
   * archtable, scripts/dpkg-architecture.pl: add entries for SuperH
   * 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
     + initialize dop->backrev as well when creating new dependency
     + only allow exact version relations when dealing with provides
     + only allow exact version relations when dealing with provides
   * TODO: remove versioned 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)
     cvsclean tree)
 
 
 Thu Jun 15 10:09:03 EDT 2000 Ben Collins <bcollins@debian.org>
 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
   * scripts/dpkg-shlibdeps.pl: update to version from dpkg_test_bz2_syslog_sigs
     branch:
     branch:
     + use objdump instead of ldd
     + 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>
 Sun Jan 16 22:07:12 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
 

+ 1 - 2
scripts/dpkg-shlibdeps.pl

@@ -196,10 +196,9 @@ sub scanshlibsfile {
     $fn= "./$fn" if $fn =~ m/^\s/;
     $fn= "./$fn" if $fn =~ m/^\s/;
     if (!open(SLF,"< $fn")) {
     if (!open(SLF,"< $fn")) {
         $! == ENOENT || syserr("unable to open shared libs info file \`$fn'");
         $! == ENOENT || syserr("unable to open shared libs info file \`$fn'");
-#print STDERR "scanshlibsfile($fn,$ln,$lsn,$lf) ... ENOENT\n";
         return 0;
         return 0;
     }
     }
-#print STDERR "scanshlibsfile($fn,$ln,$lsn,$lf) ...\n";
+
     while (<SLF>) {
     while (<SLF>) {
         s/\s*\n$//; next if m/^\#/;
         s/\s*\n$//; next if m/^\#/;
         if (!m/^\s*(\S+)\s+(\S+)/) {
         if (!m/^\s*(\S+)\s+(\S+)/) {

+ 1 - 1
scripts/dpkg-source.1

@@ -58,7 +58,7 @@ will read shared library dependency information from
 the
 the
 .B shlibs
 .B shlibs
 control area file of the package containing the file which
 control area file of the package containing the file which
-.B ldd
+.B objdump
 reports as satisfying the library dependency, or
 reports as satisfying the library dependency, or
 .BR /etc/dpkg/shlibs.default .
 .BR /etc/dpkg/shlibs.default .
 The first match will be used.  See the
 The first match will be used.  See the