Release 1.4.1.19

ChangeLog

@@ -1,3 +1,8 @@
+Sat Oct 30 16:22:00 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Fix file conflict between dpkg-dev, dpkg
+  * Move changelog.manual to dpkg-doc
+
 Sat Oct 30 03:31:30 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Make it all build again

debian/changelog

@@ -10,8 +10,6 @@ dpkg (1.4.1.19) unstable; urgency=low
     current, and the prefered choices.
   * dpkg-name: ignore epoch when getting version
   * 50dpkg-dev.el: add it as a conffile for dpkg-dev
-  * dpkg-shlibdeps: redirect STDERR to /dev/null for the dpkg fork so we
-    don't see dpkg's errors
   * internals.sgml: Removed references to the versions of build tools,
     they date the document.
   * debian-changelog-mode.el: added hint for better log-email handling
@@ -32,10 +30,6 @@ dpkg (1.4.1.19) unstable; urgency=low
     package that contains the generated output from this file (.ps, .html
     and .info), includes doc-base support. Internals.sgml is also not
     generated on the binary-arch target, and is no longer "byhand"
-  * scripts/dpkg-shlibdeps: start using objdump as opposed to ldd, this
-    works much more cleanly, works with libc5, and allows from better
-    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 (#48526)
   * main/{processarc.c,depcon.c}: added new structure for conflictors,
@@ -45,7 +39,7 @@ dpkg (1.4.1.19) unstable; urgency=low
     converted to loops to handle each one (processarc.c).
   * dpkg-divert: Fix check for writable filesystem, closes: #48646
 
- -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+ -- Wichert Akkerman <wakkerma@debian.org>  Sat, 30 Oct 1999 15:14:40 +0200
 
 dpkg (1.4.1.18) unstable; urgency=low
 

debian/control

@@ -43,6 +43,7 @@ Package: dpkg-doc
 Section: doc
 Priority: extra
 Architecture: all
+Replaces: dpkg-dev (<<1.4.1.19)
 Description: Dpkg Internals Documentation
  This document describes the internal operations of the dpkg program. It
  covers building aswell as the internals functions. If you are interested

debian/rules

@@ -98,7 +98,7 @@ binary-trees: build
 	cp debian/copyright debian/tmp-main/usr/share/doc/dpkg/copyright
 	chmod -x debian/tmp-main/usr/lib/libdpkg.*
 	set -e; for f in \
- usr/share/doc/dpkg/{changelog.manuals.gz} \
+ usr/share/doc/dpkg/changelog.manuals.gz \
  usr/bin/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,parsechangelog} \
  usr/bin/{dpkg-distaddfile,822-date,dpkg-scanpackages,dpkg-scansources,dpkg-name,dpkg-architecture} \
  usr/share/man/{ja,.}/man1/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,architecture}.1.gz \

po/dpkg.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-26 10:35-0400\n"
+"POT-Creation-Date: 1999-10-30 15:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,10 +121,6 @@ msgstr ""
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 
-#: lib/dbmodify.c:162
-msgid "unknown readwritereq"
-msgstr ""
-
 #: lib/dbmodify.c:198
 #, c-format
 msgid "failed to remove my own update file %.255s"
@@ -609,10 +605,6 @@ msgstr ""
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
 
-#: lib/parsehelp.c:162
-msgid "bad versiondisplayepochwhen in varbufversion"
-msgstr ""
-
 #: lib/parsehelp.c:180
 msgid "<none>"
 msgstr ""
@@ -785,10 +777,6 @@ msgstr ""
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: main/archives.c:468
-msgid "bad tar type, but already checked"
-msgstr ""
-
 #: main/archives.c:498
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
@@ -920,10 +908,6 @@ msgstr ""
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: main/archives.c:824 main/enquiry.c:456
-msgid "unknown action"
-msgstr ""
-
 #: main/archives.c:848
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
@@ -1170,10 +1154,6 @@ msgstr ""
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
 msgstr ""
 
-#: main/configure.c:366
-msgid "unknown response"
-msgstr ""
-
 #: main/configure.c:376
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
@@ -1214,10 +1194,6 @@ msgstr ""
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
 
-#: main/configure.c:421
-msgid "unknown what"
-msgstr ""
-
 #: main/configure.c:473
 #, c-format
 msgid ""
@@ -1304,18 +1280,6 @@ msgstr ""
 msgid " conflicts with "
 msgstr ""
 
-#: dselect/pkgdepcon.cc:334 main/depcon.c:136
-msgid "unknown deptype"
-msgstr ""
-
-#: main/depcon.c:182
-msgid "unknown status depending"
-msgstr ""
-
-#: main/depcon.c:188
-msgid "unknown istobe depending"
-msgstr ""
-
 #: main/depcon.c:209
 #, c-format
 msgid "  %.250s is to be removed.\n"
@@ -1356,10 +1320,6 @@ msgstr ""
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: main/depcon.c:264
-msgid "unknown istobe depended"
-msgstr ""
-
 #: main/depcon.c:294
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
@@ -1375,10 +1335,6 @@ msgstr ""
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: main/depcon.c:308
-msgid "unknown istobe provider"
-msgstr ""
-
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
@@ -1397,10 +1353,6 @@ msgstr ""
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
-#: main/depcon.c:373
-msgid "unknown istobe conflict"
-msgstr ""
-
 #. conflicts and provides the same
 #: main/depcon.c:387
 #, c-format
@@ -1412,10 +1364,6 @@ msgstr ""
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
 
-#: main/depcon.c:429
-msgid "unknown istobe conflict provider"
-msgstr ""
-
 #: main/enquiry.c:51
 msgid "(no description available)"
 msgstr ""
@@ -1472,10 +1420,6 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: main/enquiry.c:224
-msgid "unknown status checking for unpackedness"
-msgstr ""
-
 #: main/enquiry.c:237
 msgid "--yet-to-unpack does not take any arguments"
 msgstr ""
@@ -1634,10 +1578,6 @@ msgstr ""
 msgid "no hyphen after gcc-lib"
 msgstr ""
 
-#: main/enquiry.c:679
-msgid "unknown action in printarch"
-msgstr ""
-
 #: main/enquiry.c:683
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
@@ -1844,22 +1784,6 @@ msgstr ""
 msgid "read error in diversions [i]"
 msgstr ""
 
-#: main/filesdb.c:463
-msgid "iterfilestart no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:485
-msgid "iterfilenext no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:531
-msgid "filesdbinit no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:545
-msgid "findnamenode no f_largemem"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:49 main/help.c:41
 msgid "not installed"
 msgstr ""
@@ -2049,7 +1973,7 @@ msgid ""
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
 "\n"
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-longfilenames | --assert-multi-conrep\n"
+"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n"
 "\n"
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s\n"
@@ -2192,20 +2116,12 @@ msgstr ""
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: main/packages.c:100
-msgid "unknown action for pending"
-msgstr ""
-
 #: main/packages.c:116
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
 msgstr ""
 
-#: main/packages.c:142
-msgid "unknown action for queue start"
-msgstr ""
-
 #: main/packages.c:150
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
@@ -2218,14 +2134,6 @@ msgid ""
 " in this run !  Only configuring it once.\n"
 msgstr ""
 
-#: main/packages.c:159
-msgid "unknown action in duplicate"
-msgstr ""
-
-#: main/packages.c:202
-msgid "unknown action in queue"
-msgstr ""
-
 #: main/packages.c:264 main/packages.c:308 main/packages.c:321
 msgid "  Package "
 msgstr ""
@@ -2266,10 +2174,6 @@ msgstr ""
 msgid "; however:\n"
 msgstr ""
 
-#: main/packages.c:405
-msgid "unknown value for found"
-msgstr ""
-
 #: main/processarc.c:103
 msgid "cannot access archive"
 msgstr ""
@@ -2615,10 +2519,6 @@ msgstr ""
 msgid "--%s needs exactly one Packages file argument"
 msgstr ""
 
-#: main/update.c:51
-msgid "bad cipaction->arg in updateavailable"
-msgstr ""
-
 #: main/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
@@ -2637,10 +2537,6 @@ msgstr ""
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: main/update.c:74
-msgid "bad cipaction->arg in update available"
-msgstr ""
-
 #: main/update.c:93
 #, c-format
 msgid "Information about %d package(s) was updated.\n"
@@ -3926,10 +3822,6 @@ msgstr ""
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:276
-msgid "unknown menufn"
-msgstr ""
-
 #: dselect/main.cc:331
 #, c-format
 msgid "unknown action string `%.50s'"
@@ -4210,22 +4102,6 @@ msgstr ""
 msgid "unable to install new option as `%.250s'"
 msgstr ""
 
-#: dselect/pkgcmds.cc:47
-msgid "unknown statsortorder in affectedmatches"
-msgstr ""
-
-#: dselect/pkgcmds.cc:160
-msgid "unknown statsort in kd_swapstatorder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:171
-msgid "unknown sort in kd_swaporder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:207
-msgid "unknown versiondisplayopt in kd_versiondisplay"
-msgstr ""
-
 #: dselect/pkgdepcon.cc:214
 msgid "(no clientdata)"
 msgstr ""
@@ -4438,10 +4314,6 @@ msgstr ""
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:181
-msgid "unknown versiondisplayopt in setwidths"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:194
 msgid "dselect - recursive package listing"
 msgstr ""
@@ -4466,10 +4338,6 @@ msgstr ""
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:213
-msgid "bad statsort in redrawtitle/so_section"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:219
 msgid " (by priority)"
 msgstr ""
@@ -4482,10 +4350,6 @@ msgstr ""
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:228 dselect/pkgdisplay.cc:243
-msgid "bad statsort in redrawtitle/so_priority"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:234 dselect/pkgdisplay.cc:246
 msgid " (alphabetically)"
 msgstr ""
@@ -4498,10 +4362,6 @@ msgstr ""
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:251
-msgid "bad sort in redrawtitle"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:254
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
@@ -4566,42 +4426,14 @@ msgstr ""
 msgid "available version of control info for "
 msgstr ""
 
-#: dselect/pkglist.cc:48
-msgid "unknown statsortorder in compareentries"
-msgstr ""
-
-#: dselect/pkglist.cc:79
-msgid "unsorted or unknown in compareentries"
-msgstr ""
-
 #: dselect/pkglist.cc:121 dselect/pkglist.cc:122
 msgid "<null>"
 msgstr ""
 
-#: dselect/pkglist.cc:207
-msgid "unknown stat in ensurestatsortinfo sso_avail"
-msgstr ""
-
-#: dselect/pkglist.cc:240
-msgid "unknown stat in ensurestatsortinfo sso_state"
-msgstr ""
-
-#: dselect/pkglist.cc:250
-msgid "unknown statsortorder in ensurestatsortinfo"
-msgstr ""
-
-#: dselect/pkgsublist.cc:132
-msgid "unknown verrel"
-msgstr ""
-
 #: dselect/pkgtop.cc:56
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:73
-msgid "unknown statsortrder in describemany all"
-msgstr ""
-
 #: dselect/pkgtop.cc:78
 msgid "All packages"
 msgstr ""

po/en.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-26 10:35-0400\n"
+"POT-Creation-Date: 1999-10-30 15:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -124,10 +124,6 @@ msgstr "unable to access dpkg status area"
 msgid "operation requires read/write access to dpkg status area"
 msgstr "operation requires read/write access to dpkg status area"
 
-#: lib/dbmodify.c:162
-msgid "unknown readwritereq"
-msgstr ""
-
 #: lib/dbmodify.c:198
 #, c-format
 msgid "failed to remove my own update file %.255s"
@@ -624,10 +620,6 @@ msgstr "must be at least two characters"
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "character `%c' not allowed - only letters, digits and %s allowed"
 
-#: lib/parsehelp.c:162
-msgid "bad versiondisplayepochwhen in varbufversion"
-msgstr ""
-
 #: lib/parsehelp.c:180
 msgid "<none>"
 msgstr ""
@@ -807,10 +799,6 @@ msgstr "error setting ownership of symlink `%.255s'"
 msgid "error creating directory `%.255s'"
 msgstr "error creating directory `%.255s'"
 
-#: main/archives.c:468
-msgid "bad tar type, but already checked"
-msgstr "bad tar type, but already checked"
-
 #: main/archives.c:498
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
@@ -954,10 +942,6 @@ msgstr "searched, but found no packages (files matching *.deb"
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s needs at least one package archive file argument"
 
-#: main/archives.c:824 main/enquiry.c:456
-msgid "unknown action"
-msgstr "unknown action"
-
 #: main/archives.c:848
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
@@ -1235,11 +1219,6 @@ msgstr "failed to exec shell (%.250s)"
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
 msgstr "Don't forget to foreground (`fg') this process when you're done !\n"
 
-#: main/configure.c:366
-#, fuzzy
-msgid "unknown response"
-msgstr "unknown option --%s"
-
 #: main/configure.c:376
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
@@ -1281,11 +1260,6 @@ msgstr "Installing new version of config file %s ...\n"
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "unable to install `%.250s' as `%.250s'"
 
-#: main/configure.c:421
-#, fuzzy
-msgid "unknown what"
-msgstr "unknown action"
-
 #: main/configure.c:473
 #, c-format
 msgid ""
@@ -1382,20 +1356,6 @@ msgstr " recommends "
 msgid " conflicts with "
 msgstr " conflicts with "
 
-#: dselect/pkgdepcon.cc:334 main/depcon.c:136
-#, fuzzy
-msgid "unknown deptype"
-msgstr "unknown action"
-
-#: main/depcon.c:182
-#, fuzzy
-msgid "unknown status depending"
-msgstr "unknown action"
-
-#: main/depcon.c:188
-msgid "unknown istobe depending"
-msgstr ""
-
 #: main/depcon.c:209
 #, c-format
 msgid "  %.250s is to be removed.\n"
@@ -1436,10 +1396,6 @@ msgstr "  %.250s latest configured version is %.250s.\n"
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s is %s.\n"
 
-#: main/depcon.c:264
-msgid "unknown istobe depended"
-msgstr ""
-
 #: main/depcon.c:294
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
@@ -1455,10 +1411,6 @@ msgstr "  %.250s provides %.250s but is to be deconfigured.\n"
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s provides %.250s but is %s.\n"
 
-#: main/depcon.c:308
-msgid "unknown istobe provider"
-msgstr ""
-
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
@@ -1477,10 +1429,6 @@ msgstr "  %.250s (version %.250s) is to be installed.\n"
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) is %s.\n"
 
-#: main/depcon.c:373
-msgid "unknown istobe conflict"
-msgstr ""
-
 #. conflicts and provides the same
 #: main/depcon.c:387
 #, c-format
@@ -1492,10 +1440,6 @@ msgstr "  %.250s provides %.250s and is to be installed.\n"
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s provides %.250s and is %s.\n"
 
-#: main/depcon.c:429
-msgid "unknown istobe conflict provider"
-msgstr ""
-
 #: main/enquiry.c:51
 msgid "(no description available)"
 msgstr ""
@@ -1572,10 +1516,6 @@ msgstr "--audit does not take any arguments"
 msgid "<unknown>"
 msgstr "unknown action"
 
-#: main/enquiry.c:224
-msgid "unknown status checking for unpackedness"
-msgstr ""
-
 #: main/enquiry.c:237
 msgid "--yet-to-unpack does not take any arguments"
 msgstr "--yet-to-unpack does not take any arguments"
@@ -1746,11 +1686,6 @@ msgstr "no gcc-lib component"
 msgid "no hyphen after gcc-lib"
 msgstr "no hyphen after gcc-lib"
 
-#: main/enquiry.c:679
-#, fuzzy
-msgid "unknown action in printarch"
-msgstr "unknown action"
-
 #: main/enquiry.c:683
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
@@ -1962,22 +1897,6 @@ msgstr "conflicting diversions involving `%.250s' or `%.250s'"
 msgid "read error in diversions [i]"
 msgstr "read error in diversions [i]"
 
-#: main/filesdb.c:463
-msgid "iterfilestart no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:485
-msgid "iterfilenext no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:531
-msgid "filesdbinit no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:545
-msgid "findnamenode no f_largemem"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:49 main/help.c:41
 msgid "not installed"
 msgstr "not installed"
@@ -2172,7 +2091,7 @@ msgid ""
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
 "\n"
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-longfilenames | --assert-multi-conrep\n"
+"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n"
 "\n"
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s\n"
@@ -2351,11 +2270,6 @@ msgstr "need an action option"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending does not take any non-option arguments"
 
-#: main/packages.c:100
-#, fuzzy
-msgid "unknown action for pending"
-msgstr "unknown action"
-
 #: main/packages.c:116
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
@@ -2364,11 +2278,6 @@ msgstr ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
 
-#: main/packages.c:142
-#, fuzzy
-msgid "unknown action for queue start"
-msgstr "unknown action"
-
 #: main/packages.c:150
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
@@ -2383,16 +2292,6 @@ msgstr ""
 "More than one copy of package %s has been unpacked\n"
 " in this run !  Only configuring it once.\n"
 
-#: main/packages.c:159
-#, fuzzy
-msgid "unknown action in duplicate"
-msgstr "unknown action"
-
-#: main/packages.c:202
-#, fuzzy
-msgid "unknown action in queue"
-msgstr "unknown action"
-
 #: main/packages.c:264 main/packages.c:308 main/packages.c:321
 msgid "  Package "
 msgstr "  Package "
@@ -2433,10 +2332,6 @@ msgstr " is not installed.\n"
 msgid "; however:\n"
 msgstr "; however:\n"
 
-#: main/packages.c:405
-msgid "unknown value for found"
-msgstr ""
-
 #: main/processarc.c:103
 msgid "cannot access archive"
 msgstr "cannot access archive"
@@ -2798,10 +2693,6 @@ msgstr "--%s takes no arguments"
 msgid "--%s needs exactly one Packages file argument"
 msgstr "--%s needs exactly one Packages file argument"
 
-#: main/update.c:51
-msgid "bad cipaction->arg in updateavailable"
-msgstr ""
-
 #: main/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
 msgstr "unable to access dpkg status area for bulk available update"
@@ -2820,10 +2711,6 @@ msgstr "Replacing available packages info, using %s.\n"
 msgid "Updating available packages info, using %s.\n"
 msgstr "Updating available packages info, using %s.\n"
 
-#: main/update.c:74
-msgid "bad cipaction->arg in update available"
-msgstr ""
-
 #: main/update.c:93
 #, c-format
 msgid "Information about %d package(s) was updated.\n"
@@ -4201,11 +4088,6 @@ msgstr ""
 msgid "failed to getch in main menu"
 msgstr "failed to exec cat component"
 
-#: dselect/main.cc:276
-#, fuzzy
-msgid "unknown menufn"
-msgstr "unknown action"
-
 #: dselect/main.cc:331
 #, fuzzy, c-format
 msgid "unknown action string `%.50s'"
@@ -4493,22 +4375,6 @@ msgstr "unable to open new depot file `%.250s'"
 msgid "unable to install new option as `%.250s'"
 msgstr "unable to install new version of `%.255s'"
 
-#: dselect/pkgcmds.cc:47
-msgid "unknown statsortorder in affectedmatches"
-msgstr ""
-
-#: dselect/pkgcmds.cc:160
-msgid "unknown statsort in kd_swapstatorder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:171
-msgid "unknown sort in kd_swaporder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:207
-msgid "unknown versiondisplayopt in kd_versiondisplay"
-msgstr ""
-
 #: dselect/pkgdepcon.cc:214
 msgid "(no clientdata)"
 msgstr ""
@@ -4734,10 +4600,6 @@ msgstr "installed"
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:181
-msgid "unknown versiondisplayopt in setwidths"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:194
 msgid "dselect - recursive package listing"
 msgstr ""
@@ -4762,10 +4624,6 @@ msgstr ""
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:213
-msgid "bad statsort in redrawtitle/so_section"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:219
 msgid " (by priority)"
 msgstr ""
@@ -4778,10 +4636,6 @@ msgstr ""
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:228 dselect/pkgdisplay.cc:243
-msgid "bad statsort in redrawtitle/so_priority"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:234 dselect/pkgdisplay.cc:246
 msgid " (alphabetically)"
 msgstr ""
@@ -4794,10 +4648,6 @@ msgstr ""
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:251
-msgid "bad sort in redrawtitle"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:254
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
@@ -4865,42 +4715,14 @@ msgstr "%d errors in control file"
 msgid "available version of control info for "
 msgstr ""
 
-#: dselect/pkglist.cc:48
-msgid "unknown statsortorder in compareentries"
-msgstr ""
-
-#: dselect/pkglist.cc:79
-msgid "unsorted or unknown in compareentries"
-msgstr ""
-
 #: dselect/pkglist.cc:121 dselect/pkglist.cc:122
 msgid "<null>"
 msgstr ""
 
-#: dselect/pkglist.cc:207
-msgid "unknown stat in ensurestatsortinfo sso_avail"
-msgstr ""
-
-#: dselect/pkglist.cc:240
-msgid "unknown stat in ensurestatsortinfo sso_state"
-msgstr ""
-
-#: dselect/pkglist.cc:250
-msgid "unknown statsortorder in ensurestatsortinfo"
-msgstr ""
-
-#: dselect/pkgsublist.cc:132
-msgid "unknown verrel"
-msgstr ""
-
 #: dselect/pkgtop.cc:56
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:73
-msgid "unknown statsortrder in describemany all"
-msgstr ""
-
 #: dselect/pkgtop.cc:78
 #, fuzzy
 msgid "All packages"
@@ -4966,6 +4788,52 @@ msgstr ""
 msgid "Package"
 msgstr "  Package "
 
+#~ msgid "bad tar type, but already checked"
+#~ msgstr "bad tar type, but already checked"
+
+#~ msgid "unknown action"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown response"
+#~ msgstr "unknown option --%s"
+
+#, fuzzy
+#~ msgid "unknown what"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown deptype"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown status depending"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown action in printarch"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown action for pending"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown action for queue start"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown action in duplicate"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown action in queue"
+#~ msgstr "unknown action"
+
+#, fuzzy
+#~ msgid "unknown menufn"
+#~ msgstr "unknown action"
+
 #, fuzzy
 #~ msgid ""
 #~ "dpkg: regarding %s containing %s, dependency problem:\n"

po/es.po

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
-"POT-Creation-Date: 1999-10-26 10:35-0400\n"
+"POT-Creation-Date: 1999-10-30 15:10+0200\n"
 "PO-Revision-Date: 1999-05-31 00:40-0300\n"
 "Last-Translator: Nicolás Lictmaier <nick@debian.org>\n"
 "Language-Team: es\n"
@@ -116,10 +116,6 @@ msgstr ""
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 
-#: lib/dbmodify.c:162
-msgid "unknown readwritereq"
-msgstr ""
-
 #: lib/dbmodify.c:198
 #, c-format
 msgid "failed to remove my own update file %.255s"
@@ -604,10 +600,6 @@ msgstr ""
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
 
-#: lib/parsehelp.c:162
-msgid "bad versiondisplayepochwhen in varbufversion"
-msgstr ""
-
 #: lib/parsehelp.c:180
 msgid "<none>"
 msgstr ""
@@ -781,10 +773,6 @@ msgstr ""
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: main/archives.c:468
-msgid "bad tar type, but already checked"
-msgstr ""
-
 #: main/archives.c:498
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
@@ -916,10 +904,6 @@ msgstr ""
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: main/archives.c:824 main/enquiry.c:456
-msgid "unknown action"
-msgstr ""
-
 #: main/archives.c:848
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
@@ -1189,10 +1173,6 @@ msgstr ""
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
 msgstr "¡No se olvide de continuar este proceso con `fg' cuando termine!\n"
 
-#: main/configure.c:366
-msgid "unknown response"
-msgstr ""
-
 #: main/configure.c:376
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
@@ -1233,10 +1213,6 @@ msgstr "Instalando nueva versi
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
 
-#: main/configure.c:421
-msgid "unknown what"
-msgstr ""
-
 #: main/configure.c:473
 #, c-format
 msgid ""
@@ -1323,18 +1299,6 @@ msgstr " recomienda "
 msgid " conflicts with "
 msgstr " hace conflicto con "
 
-#: dselect/pkgdepcon.cc:334 main/depcon.c:136
-msgid "unknown deptype"
-msgstr ""
-
-#: main/depcon.c:182
-msgid "unknown status depending"
-msgstr ""
-
-#: main/depcon.c:188
-msgid "unknown istobe depending"
-msgstr ""
-
 #: main/depcon.c:209
 #, c-format
 msgid "  %.250s is to be removed.\n"
@@ -1375,10 +1339,6 @@ msgstr ""
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s es %s.\n"
 
-#: main/depcon.c:264
-msgid "unknown istobe depended"
-msgstr ""
-
 #: main/depcon.c:294
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
@@ -1394,10 +1354,6 @@ msgstr "  %.250s provee %.250s pero est
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: main/depcon.c:308
-msgid "unknown istobe provider"
-msgstr ""
-
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
@@ -1416,10 +1372,6 @@ msgstr "  %.250s (versi
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
-#: main/depcon.c:373
-msgid "unknown istobe conflict"
-msgstr ""
-
 #. conflicts and provides the same
 #: main/depcon.c:387
 #, c-format
@@ -1431,10 +1383,6 @@ msgstr ""
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
 
-#: main/depcon.c:429
-msgid "unknown istobe conflict provider"
-msgstr ""
-
 #: main/enquiry.c:51
 msgid "(no description available)"
 msgstr ""
@@ -1511,10 +1459,6 @@ msgstr ""
 msgid "<unknown>"
 msgstr ""
 
-#: main/enquiry.c:224
-msgid "unknown status checking for unpackedness"
-msgstr ""
-
 #: main/enquiry.c:237
 msgid "--yet-to-unpack does not take any arguments"
 msgstr ""
@@ -1673,10 +1617,6 @@ msgstr ""
 msgid "no hyphen after gcc-lib"
 msgstr ""
 
-#: main/enquiry.c:679
-msgid "unknown action in printarch"
-msgstr ""
-
 #: main/enquiry.c:683
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
@@ -1883,22 +1823,6 @@ msgstr ""
 msgid "read error in diversions [i]"
 msgstr ""
 
-#: main/filesdb.c:463
-msgid "iterfilestart no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:485
-msgid "iterfilenext no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:531
-msgid "filesdbinit no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:545
-msgid "findnamenode no f_largemem"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:49 main/help.c:41
 msgid "not installed"
 msgstr "no instalado"
@@ -2090,7 +2014,7 @@ msgid ""
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
 "\n"
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-longfilenames | --assert-multi-conrep\n"
+"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n"
 "\n"
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s\n"
@@ -2233,20 +2157,12 @@ msgstr "se necesita opci
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: main/packages.c:100
-msgid "unknown action for pending"
-msgstr ""
-
 #: main/packages.c:116
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
 "the files they come in"
 msgstr ""
 
-#: main/packages.c:142
-msgid "unknown action for queue start"
-msgstr ""
-
 #: main/packages.c:150
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
@@ -2261,14 +2177,6 @@ msgstr ""
 "Más de una copia del paquete %s se desempaquetó\n"
 " en esta corrida!  Sólo configurando una vez.\n"
 
-#: main/packages.c:159
-msgid "unknown action in duplicate"
-msgstr ""
-
-#: main/packages.c:202
-msgid "unknown action in queue"
-msgstr ""
-
 #: main/packages.c:264 main/packages.c:308 main/packages.c:321
 msgid "  Package "
 msgstr "  Paquete "
@@ -2309,10 +2217,6 @@ msgstr " no est
 msgid "; however:\n"
 msgstr "; sin embargo:\n"
 
-#: main/packages.c:405
-msgid "unknown value for found"
-msgstr ""
-
 #: main/processarc.c:103
 msgid "cannot access archive"
 msgstr ""
@@ -2660,10 +2564,6 @@ msgstr ""
 msgid "--%s needs exactly one Packages file argument"
 msgstr ""
 
-#: main/update.c:51
-msgid "bad cipaction->arg in updateavailable"
-msgstr ""
-
 #: main/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
@@ -2682,10 +2582,6 @@ msgstr ""
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: main/update.c:74
-msgid "bad cipaction->arg in update available"
-msgstr ""
-
 #: main/update.c:93
 #, c-format
 msgid "Information about %d package(s) was updated.\n"
@@ -3973,10 +3869,6 @@ msgstr ""
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:276
-msgid "unknown menufn"
-msgstr ""
-
 #: dselect/main.cc:331
 #, c-format
 msgid "unknown action string `%.50s'"
@@ -4257,22 +4149,6 @@ msgstr ""
 msgid "unable to install new option as `%.250s'"
 msgstr ""
 
-#: dselect/pkgcmds.cc:47
-msgid "unknown statsortorder in affectedmatches"
-msgstr ""
-
-#: dselect/pkgcmds.cc:160
-msgid "unknown statsort in kd_swapstatorder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:171
-msgid "unknown sort in kd_swaporder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:207
-msgid "unknown versiondisplayopt in kd_versiondisplay"
-msgstr ""
-
 #: dselect/pkgdepcon.cc:214
 msgid "(no clientdata)"
 msgstr ""
@@ -4497,10 +4373,6 @@ msgstr "instalado"
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:181
-msgid "unknown versiondisplayopt in setwidths"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:194
 msgid "dselect - recursive package listing"
 msgstr ""
@@ -4525,10 +4397,6 @@ msgstr ""
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:213
-msgid "bad statsort in redrawtitle/so_section"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:219
 msgid " (by priority)"
 msgstr ""
@@ -4541,10 +4409,6 @@ msgstr ""
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:228 dselect/pkgdisplay.cc:243
-msgid "bad statsort in redrawtitle/so_priority"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:234 dselect/pkgdisplay.cc:246
 msgid " (alphabetically)"
 msgstr ""
@@ -4557,10 +4421,6 @@ msgstr ""
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:251
-msgid "bad sort in redrawtitle"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:254
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
@@ -4627,42 +4487,14 @@ msgstr "Instalando nueva versi
 msgid "available version of control info for "
 msgstr ""
 
-#: dselect/pkglist.cc:48
-msgid "unknown statsortorder in compareentries"
-msgstr ""
-
-#: dselect/pkglist.cc:79
-msgid "unsorted or unknown in compareentries"
-msgstr ""
-
 #: dselect/pkglist.cc:121 dselect/pkglist.cc:122
 msgid "<null>"
 msgstr ""
 
-#: dselect/pkglist.cc:207
-msgid "unknown stat in ensurestatsortinfo sso_avail"
-msgstr ""
-
-#: dselect/pkglist.cc:240
-msgid "unknown stat in ensurestatsortinfo sso_state"
-msgstr ""
-
-#: dselect/pkglist.cc:250
-msgid "unknown statsortorder in ensurestatsortinfo"
-msgstr ""
-
-#: dselect/pkgsublist.cc:132
-msgid "unknown verrel"
-msgstr ""
-
 #: dselect/pkgtop.cc:56
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:73
-msgid "unknown statsortrder in describemany all"
-msgstr ""
-
 #: dselect/pkgtop.cc:78
 #, fuzzy
 msgid "All packages"

po/fr.po

@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.4.0.14\n"
-"POT-Creation-Date: 1999-10-26 10:35-0400\n"
+"POT-Creation-Date: 1999-10-30 15:10+0200\n"
 "PO-Revision-Date: 1997-05-13 22:07 EDT\n"
 "Last-Translator: Christophe Le Bars <clebars@debian.org>\n"
 "Language-Team: French\n"
@@ -179,10 +179,6 @@ msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 "opération demandant un accès en lecture-écriture dans la zone d'états de dpkg"
 
-#: lib/dbmodify.c:162
-msgid "unknown readwritereq"
-msgstr ""
-
 #: lib/dbmodify.c:198
 #, c-format
 msgid "failed to remove my own update file %.255s"
@@ -699,10 +695,6 @@ msgstr ""
 "caractère `%c' non-autorisé - seuls les lettres, les chiffres et %s sont "
 "autorisés"
 
-#: lib/parsehelp.c:162
-msgid "bad versiondisplayepochwhen in varbufversion"
-msgstr ""
-
 #: lib/parsehelp.c:180
 msgid "<none>"
 msgstr ""
@@ -885,10 +877,6 @@ msgstr "erreur en param
 msgid "error creating directory `%.255s'"
 msgstr "erreur en créant le répertoire `%.255s'"
 
-#: main/archives.c:468
-msgid "bad tar type, but already checked"
-msgstr "mauvais type de tar, mais déjà contrôlé"
-
 #: main/archives.c:498
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
@@ -1039,10 +1027,6 @@ msgstr "recherch
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s a besoin au moins d'un fichier archive de paquet comme argument"
 
-#: main/archives.c:824 main/enquiry.c:456
-msgid "unknown action"
-msgstr "action inconnue"
-
 #: main/archives.c:848
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
@@ -1333,11 +1317,6 @@ msgstr ""
 "N'oubliez pas de mettre à l'avant plan (`fg') ce processus lorsque vous "
 "aurez fini !\n"
 
-#: main/configure.c:366
-#, fuzzy
-msgid "unknown response"
-msgstr "option --%s inconnue"
-
 #: main/configure.c:376
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
@@ -1386,11 +1365,6 @@ msgstr ""
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "impossible d'installer `%.250s' comme `%.250s'"
 
-#: main/configure.c:421
-#, fuzzy
-msgid "unknown what"
-msgstr "action inconnue"
-
 #: main/configure.c:473
 #, c-format
 msgid ""
@@ -1493,20 +1467,6 @@ msgstr " recommande "
 msgid " conflicts with "
 msgstr " rentre en conflit avec "
 
-#: dselect/pkgdepcon.cc:334 main/depcon.c:136
-#, fuzzy
-msgid "unknown deptype"
-msgstr "action inconnue"
-
-#: main/depcon.c:182
-#, fuzzy
-msgid "unknown status depending"
-msgstr "action inconnue"
-
-#: main/depcon.c:188
-msgid "unknown istobe depending"
-msgstr ""
-
 #: main/depcon.c:209
 #, c-format
 msgid "  %.250s is to be removed.\n"
@@ -1547,10 +1507,6 @@ msgstr "  la derni
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s est %s.\n"
 
-#: main/depcon.c:264
-msgid "unknown istobe depended"
-msgstr ""
-
 #: main/depcon.c:294
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
@@ -1566,10 +1522,6 @@ msgstr "  %.250s fourni %.250s mais doit
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fourni %.250s mais est %s.\n"
 
-#: main/depcon.c:308
-msgid "unknown istobe provider"
-msgstr ""
-
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
@@ -1588,10 +1540,6 @@ msgstr "  %.250s (version %.250s) doit
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) est %s.\n"
 
-#: main/depcon.c:373
-msgid "unknown istobe conflict"
-msgstr ""
-
 #. conflicts and provides the same
 #: main/depcon.c:387
 #, c-format
@@ -1603,10 +1551,6 @@ msgstr "  %.250s fourni %.250s et doit
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s fourni %.250s et est %s.\n"
 
-#: main/depcon.c:429
-msgid "unknown istobe conflict provider"
-msgstr ""
-
 #: main/enquiry.c:51
 msgid "(no description available)"
 msgstr ""
@@ -1686,10 +1630,6 @@ msgstr "--audit ne prend aucun argument"
 msgid "<unknown>"
 msgstr "action inconnue"
 
-#: main/enquiry.c:224
-msgid "unknown status checking for unpackedness"
-msgstr ""
-
 #: main/enquiry.c:237
 msgid "--yet-to-unpack does not take any arguments"
 msgstr "--yet-to-unpack ne prend aucun argument"
@@ -1864,11 +1804,6 @@ msgstr "pas de composant gcc-lib"
 msgid "no hyphen after gcc-lib"
 msgstr "pas de trait d'union pas gcc-lib"
 
-#: main/enquiry.c:679
-#, fuzzy
-msgid "unknown action in printarch"
-msgstr "action inconnue"
-
 #: main/enquiry.c:683
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
@@ -2104,22 +2039,6 @@ msgstr "d
 msgid "read error in diversions [i]"
 msgstr "erreur de lecture dans les détournements [i]"
 
-#: main/filesdb.c:463
-msgid "iterfilestart no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:485
-msgid "iterfilenext no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:531
-msgid "filesdbinit no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:545
-msgid "findnamenode no f_largemem"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:49 main/help.c:41
 msgid "not installed"
 msgstr "non installé"
@@ -2317,7 +2236,7 @@ msgid ""
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
 "\n"
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-longfilenames | --assert-multi-conrep\n"
+"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n"
 "\n"
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s\n"
@@ -2505,11 +2424,6 @@ msgstr "manque une option d'action"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending ne prend pas d'argument non-optionnel"
 
-#: main/packages.c:100
-#, fuzzy
-msgid "unknown action for pending"
-msgstr "action inconnue"
-
 #: main/packages.c:116
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
@@ -2518,11 +2432,6 @@ msgstr ""
 "vous devez spécifier les paquets par leurs noms, et non par les noms des "
 "fichiers qui les contiennent"
 
-#: main/packages.c:142
-#, fuzzy
-msgid "unknown action for queue start"
-msgstr "action inconnue"
-
 #: main/packages.c:150
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
@@ -2537,16 +2446,6 @@ msgstr ""
 "Plus d'une copie du paquet %s ont été dépaquetées\n"
 " dans ce traitement ! Configuration d'un seul.\n"
 
-#: main/packages.c:159
-#, fuzzy
-msgid "unknown action in duplicate"
-msgstr "action inconnue"
-
-#: main/packages.c:202
-#, fuzzy
-msgid "unknown action in queue"
-msgstr "action inconnue"
-
 #: main/packages.c:264 main/packages.c:308 main/packages.c:321
 msgid "  Package "
 msgstr "  Paquet "
@@ -2587,10 +2486,6 @@ msgstr " n'est pas install
 msgid "; however:\n"
 msgstr "; malgré tout:\n"
 
-#: main/packages.c:405
-msgid "unknown value for found"
-msgstr ""
-
 #: main/processarc.c:103
 msgid "cannot access archive"
 msgstr "ne peut pas accéder à l'archive"
@@ -2981,10 +2876,6 @@ msgstr "-%s ne prend pas d'arguments"
 msgid "--%s needs exactly one Packages file argument"
 msgstr "--%s a besoin exactement d'un fichier \"Packages\""
 
-#: main/update.c:51
-msgid "bad cipaction->arg in updateavailable"
-msgstr ""
-
 #: main/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
@@ -3008,10 +2899,6 @@ msgid "Updating available packages info, using %s.\n"
 msgstr ""
 "Mise à jour de l'information sur les paquets disponibles, en utilisant %s.\n"
 
-#: main/update.c:74
-msgid "bad cipaction->arg in update available"
-msgstr ""
-
 #: main/update.c:93
 #, c-format
 msgid "Information about %d package(s) was updated.\n"
@@ -4439,11 +4326,6 @@ msgstr ""
 msgid "failed to getch in main menu"
 msgstr "échec pour exécuter \"cat\" composant"
 
-#: dselect/main.cc:276
-#, fuzzy
-msgid "unknown menufn"
-msgstr "action inconnue"
-
 #: dselect/main.cc:331
 #, fuzzy, c-format
 msgid "unknown action string `%.50s'"
@@ -4736,22 +4618,6 @@ msgstr "impossible d'ouvrir un nouveau fichier \"depot\" `%.250s'"
 msgid "unable to install new option as `%.250s'"
 msgstr "impossible d'installer une nouvelle version de `%.255s'"
 
-#: dselect/pkgcmds.cc:47
-msgid "unknown statsortorder in affectedmatches"
-msgstr ""
-
-#: dselect/pkgcmds.cc:160
-msgid "unknown statsort in kd_swapstatorder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:171
-msgid "unknown sort in kd_swaporder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:207
-msgid "unknown versiondisplayopt in kd_versiondisplay"
-msgstr ""
-
 #: dselect/pkgdepcon.cc:214
 msgid "(no clientdata)"
 msgstr ""
@@ -4978,10 +4844,6 @@ msgstr "install
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:181
-msgid "unknown versiondisplayopt in setwidths"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:194
 msgid "dselect - recursive package listing"
 msgstr ""
@@ -5006,10 +4868,6 @@ msgstr ""
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:213
-msgid "bad statsort in redrawtitle/so_section"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:219
 msgid " (by priority)"
 msgstr ""
@@ -5022,10 +4880,6 @@ msgstr ""
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:228 dselect/pkgdisplay.cc:243
-msgid "bad statsort in redrawtitle/so_priority"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:234 dselect/pkgdisplay.cc:246
 msgid " (alphabetically)"
 msgstr ""
@@ -5038,10 +4892,6 @@ msgstr ""
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:251
-msgid "bad sort in redrawtitle"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:254
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
@@ -5109,42 +4959,14 @@ msgstr "%d erreurs dans le fichier \"control\""
 msgid "available version of control info for "
 msgstr ""
 
-#: dselect/pkglist.cc:48
-msgid "unknown statsortorder in compareentries"
-msgstr ""
-
-#: dselect/pkglist.cc:79
-msgid "unsorted or unknown in compareentries"
-msgstr ""
-
 #: dselect/pkglist.cc:121 dselect/pkglist.cc:122
 msgid "<null>"
 msgstr ""
 
-#: dselect/pkglist.cc:207
-msgid "unknown stat in ensurestatsortinfo sso_avail"
-msgstr ""
-
-#: dselect/pkglist.cc:240
-msgid "unknown stat in ensurestatsortinfo sso_state"
-msgstr ""
-
-#: dselect/pkglist.cc:250
-msgid "unknown statsortorder in ensurestatsortinfo"
-msgstr ""
-
-#: dselect/pkgsublist.cc:132
-msgid "unknown verrel"
-msgstr ""
-
 #: dselect/pkgtop.cc:56
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:73
-msgid "unknown statsortrder in describemany all"
-msgstr ""
-
 #: dselect/pkgtop.cc:78
 #, fuzzy
 msgid "All packages"
@@ -5210,6 +5032,52 @@ msgstr ""
 msgid "Package"
 msgstr "  Paquet "
 
+#~ msgid "bad tar type, but already checked"
+#~ msgstr "mauvais type de tar, mais déjà contrôlé"
+
+#~ msgid "unknown action"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown response"
+#~ msgstr "option --%s inconnue"
+
+#, fuzzy
+#~ msgid "unknown what"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown deptype"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown status depending"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown action in printarch"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown action for pending"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown action for queue start"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown action in duplicate"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown action in queue"
+#~ msgstr "action inconnue"
+
+#, fuzzy
+#~ msgid "unknown menufn"
+#~ msgstr "action inconnue"
+
 #, fuzzy
 #~ msgid ""
 #~ "dpkg: regarding %s containing %s, dependency problem:\n"

po/ja_JP.ujis.po

@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.4.0.22\n"
-"POT-Creation-Date: 1999-10-26 10:35-0400\n"
+"POT-Creation-Date: 1999-10-30 15:10+0200\n"
 "PO-Revision-Date: 1999-03-06 16:25+09:00\n"
 "Last-Translator: Masato Taruishi <taru@debian.or.jp>\n"
 "Language-Team: Japanease <taru@debian.or.jp>\n"
@@ -134,10 +134,6 @@ msgstr "dpkg
 msgid "operation requires read/write access to dpkg status area"
 msgstr "操作は dpkg ステータスエリアへの読み書きの権限が必要です。"
 
-#: lib/dbmodify.c:162
-msgid "unknown readwritereq"
-msgstr ""
-
 #: lib/dbmodify.c:198
 #, c-format
 msgid "failed to remove my own update file %.255s"
@@ -649,10 +645,6 @@ msgstr "
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "文字`%c'は許されません - 文字、数値と %s のみ使用可能です。"
 
-#: lib/parsehelp.c:162
-msgid "bad versiondisplayepochwhen in varbufversion"
-msgstr ""
-
 #: lib/parsehelp.c:180
 msgid "<none>"
 msgstr ""
@@ -834,10 +826,6 @@ msgstr "
 msgid "error creating directory `%.255s'"
 msgstr "ディレクトリ`%.255s'の作成エラーです。"
 
-#: main/archives.c:468
-msgid "bad tar type, but already checked"
-msgstr "tar 型が不正であるにもかかわらず、既にチェックされています。"
-
 #: main/archives.c:498
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
@@ -989,10 +977,6 @@ msgstr ""
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s は引数として最低1つのパッケージアーカイブファイルが必要です。"
 
-#: main/archives.c:824 main/enquiry.c:456
-msgid "unknown action"
-msgstr "不明なアクションです。"
-
 #: main/archives.c:848
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
@@ -1281,11 +1265,6 @@ msgstr ""
 "��ǧ�����餳�Υץ�������ե���������(`fg')�ˤ���Τ�˺��ʤ��褦�ˤ��ޤ���"
 "�!\n"
 
-#: main/configure.c:366
-#, fuzzy
-msgid "unknown response"
-msgstr "不明なオプション --%s"
-
 #: main/configure.c:376
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
@@ -1326,11 +1305,6 @@ msgstr "
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr "`%.250s' を `%.250s' としてインストールできません。"
 
-#: main/configure.c:421
-#, fuzzy
-msgid "unknown what"
-msgstr "不明なアクションです。"
-
 #: main/configure.c:473
 #, c-format
 msgid ""
@@ -1428,20 +1402,6 @@ msgstr "
 msgid " conflicts with "
 msgstr " は次と衝突(conflicts)します: "
 
-#: dselect/pkgdepcon.cc:334 main/depcon.c:136
-#, fuzzy
-msgid "unknown deptype"
-msgstr "不明なアクションです。"
-
-#: main/depcon.c:182
-#, fuzzy
-msgid "unknown status depending"
-msgstr "不明なアクションです。"
-
-#: main/depcon.c:188
-msgid "unknown istobe depending"
-msgstr ""
-
 #: main/depcon.c:209
 #, c-format
 msgid "  %.250s is to be removed.\n"
@@ -1483,10 +1443,6 @@ msgstr "  %.250s
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s は %s です\n"
 
-#: main/depcon.c:264
-msgid "unknown istobe depended"
-msgstr ""
-
 #: main/depcon.c:294
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
@@ -1502,10 +1458,6 @@ msgstr "  %.250s
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %2$.250s を提供(provides)する %1$.250s が%3$sです。\n"
 
-#: main/depcon.c:308
-msgid "unknown istobe provider"
-msgstr ""
-
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
@@ -1524,10 +1476,6 @@ msgstr "  %.250s (
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (バージョン %.250s) が%sです。\n"
 
-#: main/depcon.c:373
-msgid "unknown istobe conflict"
-msgstr ""
-
 #. conflicts and provides the same
 #: main/depcon.c:387
 #, c-format
@@ -1539,10 +1487,6 @@ msgstr "  %2$.250s
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %2$.250s を提供する %1$.250s が%3$sです。\n"
 
-#: main/depcon.c:429
-msgid "unknown istobe conflict provider"
-msgstr ""
-
 #: main/enquiry.c:51
 msgid "(no description available)"
 msgstr ""
@@ -1624,10 +1568,6 @@ msgstr "--audit
 msgid "<unknown>"
 msgstr "不明なアクションです。"
 
-#: main/enquiry.c:224
-msgid "unknown status checking for unpackedness"
-msgstr ""
-
 #: main/enquiry.c:237
 msgid "--yet-to-unpack does not take any arguments"
 msgstr "--yet-to-unpack に引数は必要ありません。"
@@ -1802,11 +1742,6 @@ msgstr "gcc-lib
 msgid "no hyphen after gcc-lib"
 msgstr "gcc-lib の後にハイフンがありません"
 
-#: main/enquiry.c:679
-#, fuzzy
-msgid "unknown action in printarch"
-msgstr "不明なアクションです。"
-
 #: main/enquiry.c:683
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
@@ -2027,22 +1962,6 @@ msgstr "`%.250s'
 msgid "read error in diversions [i]"
 msgstr "diversions の読み込みエラー[i]"
 
-#: main/filesdb.c:463
-msgid "iterfilestart no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:485
-msgid "iterfilenext no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:531
-msgid "filesdbinit no f_largemem"
-msgstr ""
-
-#: main/filesdb.c:545
-msgid "findnamenode no f_largemem"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:49 main/help.c:41
 msgid "not installed"
 msgstr "非インストール"
@@ -2237,7 +2156,7 @@ msgid ""
 " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
 "\n"
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-longfilenames | --assert-multi-conrep\n"
+"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n"
 "\n"
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s\n"
@@ -2488,11 +2407,6 @@ msgstr "
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending はオプション以外の引数を取りません。"
 
-#: main/packages.c:100
-#, fuzzy
-msgid "unknown action for pending"
-msgstr "不明なアクションです。"
-
 #: main/packages.c:116
 msgid ""
 "you must specify packages by their own names, not by quoting the names of "
@@ -2501,11 +2415,6 @@ msgstr ""
 "�ѥå�����̾�Ȥ��ƻ��ꤹ��Τϡ�������˴ޤޤ�Ƥ���ե������̾���ǤϤʤ����"
 "ѥå������Υե�����̾(*.deb)�Ǥʤ���Ф����ޤ���"
 
-#: main/packages.c:142
-#, fuzzy
-msgid "unknown action for queue start"
-msgstr "不明なアクションです。"
-
 #: main/packages.c:150
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
@@ -2520,16 +2429,6 @@ msgstr ""
 "現在の実行中にパッケージ %s のコピーが複数展開されました！\n"
 "1回だけ設定を行います。\n"
 
-#: main/packages.c:159
-#, fuzzy
-msgid "unknown action in duplicate"
-msgstr "不明なアクションです。"
-
-#: main/packages.c:202
-#, fuzzy
-msgid "unknown action in queue"
-msgstr "不明なアクションです。"
-
 #: main/packages.c:264 main/packages.c:308 main/packages.c:321
 msgid "  Package "
 msgstr "  パッケージ "
@@ -2570,10 +2469,6 @@ msgstr "
 msgid "; however:\n"
 msgstr " ...しかし:\n"
 
-#: main/packages.c:405
-msgid "unknown value for found"
-msgstr ""
-
 #: main/processarc.c:103
 msgid "cannot access archive"
 msgstr "アーカイブにアクセスできません。"
@@ -2951,10 +2846,6 @@ msgstr "--%s
 msgid "--%s needs exactly one Packages file argument"
 msgstr "--%s は引数に Packages ファイルをひとつだけ必要とします。"
 
-#: main/update.c:51
-msgid "bad cipaction->arg in updateavailable"
-msgstr ""
-
 #: main/update.c:57
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
@@ -2976,10 +2867,6 @@ msgstr "%s
 msgid "Updating available packages info, using %s.\n"
 msgstr "%s を使い、利用可能なパッケージ情報を追加しています。\n"
 
-#: main/update.c:74
-msgid "bad cipaction->arg in update available"
-msgstr ""
-
 #: main/update.c:93
 #, c-format
 msgid "Information about %d package(s) was updated.\n"
@@ -4392,11 +4279,6 @@ msgstr ""
 msgid "failed to getch in main menu"
 msgstr "コンポーネントの cat の実行に失敗しました。"
 
-#: dselect/main.cc:276
-#, fuzzy
-msgid "unknown menufn"
-msgstr "不明なアクションです。"
-
 #: dselect/main.cc:331
 #, fuzzy, c-format
 msgid "unknown action string `%.50s'"
@@ -4684,22 +4566,6 @@ msgstr "
 msgid "unable to install new option as `%.250s'"
 msgstr "`%.255s'の新バージョンをインストールできません。"
 
-#: dselect/pkgcmds.cc:47
-msgid "unknown statsortorder in affectedmatches"
-msgstr ""
-
-#: dselect/pkgcmds.cc:160
-msgid "unknown statsort in kd_swapstatorder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:171
-msgid "unknown sort in kd_swaporder"
-msgstr ""
-
-#: dselect/pkgcmds.cc:207
-msgid "unknown versiondisplayopt in kd_versiondisplay"
-msgstr ""
-
 #: dselect/pkgdepcon.cc:214
 msgid "(no clientdata)"
 msgstr ""
@@ -4925,10 +4791,6 @@ msgstr "
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:181
-msgid "unknown versiondisplayopt in setwidths"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:194
 msgid "dselect - recursive package listing"
 msgstr ""
@@ -4953,10 +4815,6 @@ msgstr ""
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:213
-msgid "bad statsort in redrawtitle/so_section"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:219
 msgid " (by priority)"
 msgstr ""
@@ -4969,10 +4827,6 @@ msgstr ""
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:228 dselect/pkgdisplay.cc:243
-msgid "bad statsort in redrawtitle/so_priority"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:234 dselect/pkgdisplay.cc:246
 msgid " (alphabetically)"
 msgstr ""
@@ -4985,10 +4839,6 @@ msgstr ""
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:251
-msgid "bad sort in redrawtitle"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:254
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
@@ -5056,42 +4906,14 @@ msgstr "
 msgid "available version of control info for "
 msgstr ""
 
-#: dselect/pkglist.cc:48
-msgid "unknown statsortorder in compareentries"
-msgstr ""
-
-#: dselect/pkglist.cc:79
-msgid "unsorted or unknown in compareentries"
-msgstr ""
-
 #: dselect/pkglist.cc:121 dselect/pkglist.cc:122
 msgid "<null>"
 msgstr ""
 
-#: dselect/pkglist.cc:207
-msgid "unknown stat in ensurestatsortinfo sso_avail"
-msgstr ""
-
-#: dselect/pkglist.cc:240
-msgid "unknown stat in ensurestatsortinfo sso_state"
-msgstr ""
-
-#: dselect/pkglist.cc:250
-msgid "unknown statsortorder in ensurestatsortinfo"
-msgstr ""
-
-#: dselect/pkgsublist.cc:132
-msgid "unknown verrel"
-msgstr ""
-
 #: dselect/pkgtop.cc:56
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:73
-msgid "unknown statsortrder in describemany all"
-msgstr ""
-
 #: dselect/pkgtop.cc:78
 #, fuzzy
 msgid "All packages"
@@ -5157,6 +4979,52 @@ msgstr ""
 msgid "Package"
 msgstr "  パッケージ "
 
+#~ msgid "bad tar type, but already checked"
+#~ msgstr "tar 型が不正であるにもかかわらず、既にチェックされています。"
+
+#~ msgid "unknown action"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown response"
+#~ msgstr "不明なオプション --%s"
+
+#, fuzzy
+#~ msgid "unknown what"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown deptype"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown status depending"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown action in printarch"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown action for pending"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown action for queue start"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown action in duplicate"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown action in queue"
+#~ msgstr "不明なアクションです。"
+
+#, fuzzy
+#~ msgid "unknown menufn"
+#~ msgstr "不明なアクションです。"
+
 #, fuzzy
 #~ msgid ""
 #~ "dpkg: regarding %s containing %s, dependency problem:\n"

scripts/dpkg-shlibdeps.pl

@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#! /usr/bin/perl
 
-$dpkglibdir= ".";
-$version= '1.3.8'; # This line modified by Makefile
+$dpkglibdir="/usr/lib/dpkg";
+$version="1.4.1.18"; # This line modified by Makefile
 
 use POSIX;
 use POSIX qw(:errno_h :signal_h);
@@ -88,83 +88,40 @@ sub isbin {
 
 for ($i=0;$i<=$#exec;$i++) {
     if (!isbin ($exec[$i])) { next; }
-    defined($c= open(P,"-|")) || syserr("cannot fork for objdump");
-    if (!$c) { exec("objdump","-p","--",$exec[$i]); syserr("cannot exec objdump"); }
+    defined($c= open(P,"-|")) || syserr("cannot fork for ldd");
+    if (!$c) { exec("ldd","--",$exec[$i]); syserr("cannot exec ldd"); }
+    $nthisldd=0;
     while (<P>) {
-	chomp;
-	if (m,^\s*NEEDED\s+(\S+)\.so\.(\S+)$,) {
-	    push(@libname,$1); push(@libsoname,$2);
+    	chomp;
+	if (m,^\s+(\S+)\s+\=\>\s+\1$,) {
+	    # shared libraries depend on themselves (unsure why)
+	    # Only under old ld.so
+	    $nthisldd++;
+	} elsif (m,\s+statically linked(\s+\(ELF\))?$,) {
+	    $nthisldd++;
+	} elsif (m,^\s+(\S+)\.so\.(\S+)\s+=>\s+(/\S+)(\s+\(0x.+\))?$,) {
+	    push(@libname,$1); push(@libsoname,$2); push(@libpath,$3);
 	    push(@libf,$execf[$i]);
-	    push(@libfiles,"$1.so.$2");
+	    push(@libpaths,$3) if !$libpathadded{$3}++;
+	    $nthisldd++;
+	} else {
+	    &warn("unknown output from ldd on \`$exec[$i]': \`$_'");
 	}
     }
-    close(P); $? && subprocerr("objdump on \`$exec[$i]'");
+    close(P); $? && subprocerr("ldd on \`$exec[$i]'");
+    $nthisldd || &warn("ldd on \`$exec[$i]' gave nothing on standard output");
 }
 
-# Now: See if it is in this package.  See if it is in any other package.
-sub searchdir {
-    my $dir = shift;
-    if(opendir(DIR, $dir)) {
-	my @dirents = readdir(DIR);
-	closedir(DIR);
-	for (@dirents) {
-	    if ( -f "$dir/$_/DEBIAN/shlibs" ) {
-		push(@curshlibs, "$dir/$_/DEBIAN/shlibs");
-		next;
-	    } elsif ( $_ !~ /^\./ && -d "$dir/$_" ) {
-		&searchdir("$dir/$_");
-	    }
-	}
-    }
-}
-
-$searchdir = $exec[0];
-$curpackdir = "debian/tmp";
-do { $searchdir =~ s,/[^/]*$,,; } while($searchdir =~ m,/, && ! -d "$searchdir/DEBIAN");
-if ($searchdir =~ m,/,) {
-    $curpackdir = $searchdir;
-    $searchdir =~ s,/[^/]*,,;
-    &searchdir($searchdir);
-}
-
-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);
-		splice(@libsoname, $i, 1);
-		splice(@libf, $i, 1);
-		splice(@libfiles, $i, 1);
-		$i--;
-		next PRELIB;
-	    }
-	}
-    }
-}
-
-if ($#libfiles >= 0) {
-    grep(s/\[\?\*/\\$&/g, @libname);
+if ($#libpaths >= 0) {
+    grep(s/\[\?\*/\\$&/g, @libpaths);
     defined($c= open(P,"-|")) || syserr("cannot fork for dpkg --search");
-    if (!$c) {
-        close STDERR; # we don't need to see dpkg's errors
-	open STDERR, "> /dev/null";
-        exec("dpkg","--search","--",map {"*/$_"} @libfiles); syserr("cannot exec dpkg");
-    }
+    if (!$c) { exec("dpkg","--search","--",@libpaths); syserr("cannot exec dpkg"); }
     while (<P>) {
-       chomp;
+       s/\n$//;
        if (m/^local diversion |^diversion by/) {
            &warn("diversions involved - output may be incorrect");
            print(STDERR " $_\n") || syserr("write diversion info to stderr");
-       } elsif (m=^(\S+(, \S+)*): /.+/([^/]+)$=) {
+       } elsif (m=^(\S+(, \S+)*): (/.+)$=) {
            $pathpackages{$+}= $1;
        } else {
            &warn("unknown output from dpkg --search: \`$_'");
@@ -174,20 +131,22 @@ if ($#libfiles >= 0) {
 }
 
 LIB: for ($i=0;$i<=$#libname;$i++) {
-    if (!defined($pathpackages{$libfiles[$i]})) {
-        &warn("could not find any packages for $libfiles[$i]".
+    scanshlibsfile($shlibslocal,$libname[$i],$libsoname[$i],$libf[$i]) && next;
+    scanshlibsfile($shlibsoverride,$libname[$i],$libsoname[$i],$libf[$i]) && next;
+    if (!defined($pathpackages{$libpath[$i]})) {
+        &warn("could not find any packages for $libpath[$i]".
               " ($libname[$i].so.$libsoname[$i])");
     } else {
-        @packages= split(/, /,$pathpackages{$libfiles[$i]});
+        @packages= split(/, /,$pathpackages{$libpath[$i]});
         for $p (@packages) {
             scanshlibsfile("$shlibsppdir/$p$shlibsppext",
                            $libname[$i],$libsoname[$i],$libf[$i])
                 && next LIB;
         }
     }
-    scanshlibsfile($shlibslocal,$libname[$i],$libsoname[$i],$libf[$i]) && next;
+    scanshlibsfile($shlibsdefault,$libname[$i],$libsoname[$i],$libf[$i]) && next;
     &warn("unable to find dependency information for ".
-          "shared library $libname[$i] (soname $libsoname[$i], path $libfiles[$i], ".
+          "shared library $libname[$i] (soname $libsoname[$i], path $libpath[$i], ".
           "dependency field $libf[$i])");
 }
 
@@ -208,7 +167,6 @@ sub scanshlibsfile {
             next;
         }
         next if $1 ne $ln || $2 ne $lsn;
-        return 1 if $fn eq "debian/$curpackdir/DEBIAN/shlibs";
         $da= $';
         for $dv (split(/,/,$da)) {
             $dv =~ s/^\s+//; $dv =~ s/\s+$//;