From df7ee51fb857d09146262a6abceff47ef73396f4 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sat, 9 Sep 2000 19:20:47 +0000 Subject: [PATCH] make dpkg-shlibdeps really do what the manpage says it does --- ChangeLog | 13 +++++++++++-- scripts/dpkg-shlibdeps.pl | 3 +-- scripts/dpkg-source.1 | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6435ee78..f48df71a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 9 21:17:37 CEST 2000 Wichert Akkerman + + * scripts/dpkg-shlibdeps.pl: really make it do what the documentation + says it does. + Fri Sep 8 12:28:34 CEST 2000 Wichert Akkerman * configure.in: add de to ALL_LINGUAS @@ -7,6 +12,10 @@ Fri Sep 8 12:28:34 CEST 2000 Wichert Akkerman * 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 + + * scripts/dpkg-source.1: note that dpkg-shlibdeps uses objdump now + Sat Sep 2 18:29:56 CEST 2000 Wichert Akkerman * archtable, scripts/dpkg-architecture.pl: add entries for SuperH @@ -106,7 +115,7 @@ Thu Jun 15 13:41:28 CEST 2000 Wichert Akkerman + 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 @@ -355,7 +364,7 @@ Mon Jan 17 21:20:35 CET 2000 Wichert Akkerman * 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 diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 7f4cb88e..e90926ef 100755 --- 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 () { 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 be969dd3..18e08c51 100644 --- 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 -- 2.39.5