new dpkg-1.6.5.2, backs out calls to dpkg-safefilelist
===
diff -ruN --exclude build dpkg-1.6.5.1/debian/changelog dpkg-1.6.5.2/debian/changelog
--- dpkg-1.6.5.1/debian/changelog Mon Jan 3 17:58:47 2000
+++ dpkg-1.6.5.2/debian/changelog Mon Jan 3 17:58:35 2000
@@ -1,3 +1,11 @@
+dpkg (1.6.5.2) unstable; urgency=low
+
+ * Removed call to dpkg-safefilelist, from dpkg-deb, while a better
+ solution is found.
+ * Lintian clean(ignoring what I believe to be an errneous E:).
+
+ -- Adam Heath <doogie@debian.org> Mon, 3 Jan 2000 17:26:35 -0600
+
dpkg (1.6.5.1) unstable; urgency=low
* Fix dpkg-safefilelist so that files are doubled in .debs. Closes:
diff -ruN --exclude build dpkg-1.6.5.1/debian/control dpkg-1.6.5.2/debian/control
--- dpkg-1.6.5.1/debian/control Tue Dec 28 16:42:05 1999
+++ dpkg-1.6.5.2/debian/control Mon Jan 3 09:58:33 2000
@@ -25,7 +25,7 @@
Section: devel
Priority: important
Architecture: all
-Depends: perl5, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, dpkg
+Depends: perl5, cpio (>= 2.4.2-2), patch (>= 2.2-1), make
Recommends: c-compiler
Suggests: gnupg, debian-keyring
Conflicts: dpkgname
@@ -44,7 +44,6 @@
Section: doc
Priority: extra
Architecture: all
-Depends: dpkg
Replaces: dpkg-dev (<<1.4.1.19)
Description: Dpkg Internals Documentation
This document describes the internal operations of the dpkg program. It
diff -ruN --exclude build dpkg-1.6.5.1/dpkg-deb/build.c dpkg-1.6.5.2/dpkg-deb/build.c
--- dpkg-1.6.5.1/dpkg-deb/build.c Mon Jan 3 17:53:15 2000
+++ dpkg-1.6.5.2/dpkg-deb/build.c Mon Jan 3 17:44:22 2000
@@ -266,23 +266,23 @@
strcpy(tfbuf,envbuf);
strcat(tfbuf,"/dpkg.XXXXXX");
}
- m_pipe(p1);
+/*m_pipe(p1);
if (!(c3= m_fork())) {
m_dup2(p1[1],1); close(p1[0]); close(p1[1]);
if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
execlp(SAFEFILELIST,"dpkg-deb-filelist",(char*)0);
ohshite(_("failed to exec dpkg-deb-filelist"));
}
- close(p1[1]);
+ close(p1[1]);*/
m_pipe(p2);
if (!(c4= m_fork())) {
- m_dup2(p2[1],1); m_dup2(p1[0],0); close(p2[0]); close(p2[1]);
+ m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
if (chdir(directory)) ohshite(_("failed to chdir to `%.255s'"),directory);
- execlp(TAR,"tar","--no-recursion", "--exclude",BUILDCONTROLDIR,"-T","-","-cf","-",(char*)0);
+ execlp(TAR,"tar","--exclude",BUILDCONTROLDIR,"-cf","-", "." ,(char*)0);
ohshite(_("failed to exec tar --exclude"));
}
close(p2[1]);
- close(p1[0]);
+/*close(p1[0]);*/
if (!(c5= m_fork())) {
char *combuf;
m_dup2(p2[0],0); close(p2[0]);
@@ -301,7 +301,6 @@
close(p2[0]);
waitsubproc(c5,"gzip -9c from tar --exclude",0);
waitsubproc(c4,"tar --exclude",0);
- waitsubproc(c3,"dpkg-deb-filelist",0);
if (!oldformatflag) {
if (fstat(gzfd,&datastab)) ohshite("_(failed to fstat tmpfile (data))");
if (fprintf(ar,
diff -ruN --exclude build dpkg-1.6.5.1/po/cat-id-tbl.c dpkg-1.6.5.2/po/cat-id-tbl.c
--- dpkg-1.6.5.1/po/cat-id-tbl.c Mon Jan 3 17:56:51 2000
+++ dpkg-1.6.5.2/po/cat-id-tbl.c Wed Dec 29 18:38:06 1999
@@ -804,83 +804,82 @@
{"failed to make tmpfile (data)", 534},
{"failed to open tmpfile (data), %s", 535},
{"failed to unlink tmpfile (data), %s", 536},
- {"failed to exec dpkg-deb-filelist", 537},
- {"failed to exec tar --exclude", 538},
- {"no compression copy loop", 539},
- {"failed to exec gzip -9c from tar --exclude", 540},
- {"failed to rewind tmpfile (data)", 541},
- {"data", 542},
- {"failed to exec sh -c mv foo/* &c", 543},
- {"error reading %s from %.255s", 544},
- {"unexpected end of file in %s in %.255s", 545},
- {"file `%.250s' is corrupt - %.250s length contains nulls", 546},
- {"file `%.250s' is corrupt - bad digit (code %d) in %s", 547},
- {"failed to read archive `%.255s'", 548},
- {"failed to fstat archive", 549},
- {"file `%.250s' is corrupt - bad magic at end of first header", 550},
- {"file `%.250s' is corrupt - negative member length %ld", 551},
- {"file `%.250s' is not a debian binary archive (try dpkg-split?)", 552},
- {"archive has no newlines in header", 553},
- {"archive has no dot in version number", 554},
- {"archive version %.250s not understood, get newer dpkg-deb", 555},
- {"file `%.250s' contains ununderstood data member %.*s, giving up", 556},
- {"file `%.250s' contains two control members, giving up", 557},
+ {"failed to exec tar --exclude", 537},
+ {"no compression copy loop", 538},
+ {"failed to exec gzip -9c from tar --exclude", 539},
+ {"failed to rewind tmpfile (data)", 540},
+ {"data", 541},
+ {"failed to exec sh -c mv foo/* &c", 542},
+ {"error reading %s from %.255s", 543},
+ {"unexpected end of file in %s in %.255s", 544},
+ {"file `%.250s' is corrupt - %.250s length contains nulls", 545},
+ {"file `%.250s' is corrupt - bad digit (code %d) in %s", 546},
+ {"failed to read archive `%.255s'", 547},
+ {"failed to fstat archive", 548},
+ {"file `%.250s' is corrupt - bad magic at end of first header", 549},
+ {"file `%.250s' is corrupt - negative member length %ld", 550},
+ {"file `%.250s' is not a debian binary archive (try dpkg-split?)", 551},
+ {"archive has no newlines in header", 552},
+ {"archive has no dot in version number", 553},
+ {"archive version %.250s not understood, get newer dpkg-deb", 554},
+ {"file `%.250s' contains ununderstood data member %.*s, giving up", 555},
+ {"file `%.250s' contains two control members, giving up", 556},
{"\
new debian package, version %s.\n\
- size %ld bytes: control archive= %ld bytes.\n", 558},
- {"archive has malformatted ctrl len `%s'", 559},
+ size %ld bytes: control archive= %ld bytes.\n", 557},
+ {"archive has malformatted ctrl len `%s'", 558},
{"\
old debian package, version %s.\n\
- size %ld bytes: control archive= %ld, main archive= %ld.\n", 560},
+ size %ld bytes: control archive= %ld, main archive= %ld.\n", 559},
{"\
dpkg-deb: file looks like it might be an archive which has been\n\
-dpkg-deb: corrupted by being downloaded in ASCII mode\n", 561},
- {"`%.255s' is not a debian format archive", 562},
- {"fgetpos failed", 563},
- {"fsetpos failed", 564},
- {"failed to fdopen p1 in paste", 565},
- {"failed to write to gzip -dc", 566},
- {"failed to close gzip -dc", 567},
- {"failed to syscall lseek to files archive portion", 568},
- {"failed to fdopen p1 in copy", 569},
- {"failed to write to pipe in copy", 570},
- {"failed to close pipe in copy", 571},
- {"failed to exec gzip -dc", 572},
- {"failed to create directory", 573},
- {"failed to chdir to directory after creating it", 574},
- {"failed to chdir to directory", 575},
- {"failed to exec tar", 576},
- {"--%s needs a .deb filename argument", 577},
+dpkg-deb: corrupted by being downloaded in ASCII mode\n", 560},
+ {"`%.255s' is not a debian format archive", 561},
+ {"fgetpos failed", 562},
+ {"fsetpos failed", 563},
+ {"failed to fdopen p1 in paste", 564},
+ {"failed to write to gzip -dc", 565},
+ {"failed to close gzip -dc", 566},
+ {"failed to syscall lseek to files archive portion", 567},
+ {"failed to fdopen p1 in copy", 568},
+ {"failed to write to pipe in copy", 569},
+ {"failed to close pipe in copy", 570},
+ {"failed to exec gzip -dc", 571},
+ {"failed to create directory", 572},
+ {"failed to chdir to directory after creating it", 573},
+ {"failed to chdir to directory", 574},
+ {"failed to exec tar", 575},
+ {"--%s needs a .deb filename argument", 576},
{"\
--%s needs a target directory.\n\
-Perhaps you should be using dpkg --install ?", 578},
- {"--%s takes at most two arguments (.deb and directory", 579},
- {"--%s takes only one argument (.deb filename)", 580},
- {"failed to chdir to `/' for cleanup", 581},
- {"failed to fork for cleanup", 582},
- {"failed to wait for rm cleanup", 583},
- {"rm cleanup failed, code %d\n", 584},
- {"failed to make temporary filename", 585},
- {"failed to exec rm -rf", 586},
- {"info_spew", 587},
- {"dpkg-deb: `%.255s' contains no control component `%.255s'\n", 588},
- {"open component `%.255s' (in %.255s) failed in an unexpected way", 589},
- {"at least one requested control component missing", 590},
- {"cannot scan directory `%.255s'", 591},
- {"cannot stat `%.255s' (in `%.255s')", 592},
- {"cannot open `%.255s' (in `%.255s')", 593},
- {"failed to read `%.255s' (in `%.255s')", 594},
- {" %7ld bytes, %5d lines %c %-20.127s %.127s\n", 595},
- {" not a plain file %.255s\n", 596},
- {"failed to read `control' (in `%.255s')", 597},
- {"(no `control' file in control archive!)\n", 598},
- {"could not open the `control' component", 599},
- {"failed during read of `control' component", 600},
- {"--contents takes exactly one argument", 601},
+Perhaps you should be using dpkg --install ?", 577},
+ {"--%s takes at most two arguments (.deb and directory", 578},
+ {"--%s takes only one argument (.deb filename)", 579},
+ {"failed to chdir to `/' for cleanup", 580},
+ {"failed to fork for cleanup", 581},
+ {"failed to wait for rm cleanup", 582},
+ {"rm cleanup failed, code %d\n", 583},
+ {"failed to make temporary filename", 584},
+ {"failed to exec rm -rf", 585},
+ {"info_spew", 586},
+ {"dpkg-deb: `%.255s' contains no control component `%.255s'\n", 587},
+ {"open component `%.255s' (in %.255s) failed in an unexpected way", 588},
+ {"at least one requested control component missing", 589},
+ {"cannot scan directory `%.255s'", 590},
+ {"cannot stat `%.255s' (in `%.255s')", 591},
+ {"cannot open `%.255s' (in `%.255s')", 592},
+ {"failed to read `%.255s' (in `%.255s')", 593},
+ {" %7ld bytes, %5d lines %c %-20.127s %.127s\n", 594},
+ {" not a plain file %.255s\n", 595},
+ {"failed to read `control' (in `%.255s')", 596},
+ {"(no `control' file in control archive!)\n", 597},
+ {"could not open the `control' component", 598},
+ {"failed during read of `control' component", 599},
+ {"--contents takes exactly one argument", 600},
{"\
Copyright (C) 1994-1996 Ian Jackson. This is free software; see the\n\
GNU General Public Licence version 2 or later for copying conditions.\n\
-There is NO warranty. See dpkg-deb --licence for details.\n", 602},
+There is NO warranty. See dpkg-deb --licence for details.\n", 601},
{"\
Usage: dpkg-deb -b|--build <directory> [<deb>] Build an archive.\n\
dpkg-deb -c|--contents <deb> List contents.\n\
@@ -902,27 +901,27 @@
\n\
Use `dpkg' to install and remove packages from your system, or\n\
`dselect' for user-friendly package management. Packages unpacked\n\
-using `dpkg-deb --extract' will be incorrectly installed !\n", 603},
+using `dpkg-deb --extract' will be incorrectly installed !\n", 602},
{"\
Type dpkg-deb --help for help about manipulating *.deb files;\n\
-Type dpkg --help for help about installing and deinstalling packages.", 604},
- {"file `%.250s' is corrupt - %.250s missing", 605},
- {"file `%.250s' is corrupt - missing newline after %.250s", 606},
- {"unable to seek back", 607},
- {"file `%.250s' is corrupt - bad padding character (code %d)", 608},
- {"file `%.250s' is corrupt - nulls in info section", 609},
- {"file `%.250s' is format version `%.250s' - you need a newer dpkg-split", 610},
- {"file `%.250s' is corrupt - bad MD5 checksum `%.250s'", 611},
- {"file `%.250s' is corrupt - no slash between part numbers", 612},
- {"file `%.250s' is corrupt - bad part number", 613},
- {"file `%.250s' is corrupt - bad magic at end of second header", 614},
- {"file `%.250s' is corrupt - second member is not data member", 615},
- {"file `%.250s' is corrupt - wrong number of parts for quoted sizes", 616},
- {"file `%.250s' is corrupt - size is wrong for quoted part number", 617},
- {"unable to fstat part file `%.250s'", 618},
- {"file `%.250s' is corrupt - too short", 619},
- {"cannot open archive part file `%.250s'", 620},
- {"file `%.250s' is not an archive part", 621},
+Type dpkg --help for help about installing and deinstalling packages.", 603},
+ {"file `%.250s' is corrupt - %.250s missing", 604},
+ {"file `%.250s' is corrupt - missing newline after %.250s", 605},
+ {"unable to seek back", 606},
+ {"file `%.250s' is corrupt - bad padding character (code %d)", 607},
+ {"file `%.250s' is corrupt - nulls in info section", 608},
+ {"file `%.250s' is format version `%.250s' - you need a newer dpkg-split", 609},
+ {"file `%.250s' is corrupt - bad MD5 checksum `%.250s'", 610},
+ {"file `%.250s' is corrupt - no slash between part numbers", 611},
+ {"file `%.250s' is corrupt - bad part number", 612},
+ {"file `%.250s' is corrupt - bad magic at end of second header", 613},
+ {"file `%.250s' is corrupt - second member is not data member", 614},
+ {"file `%.250s' is corrupt - wrong number of parts for quoted sizes", 615},
+ {"file `%.250s' is corrupt - size is wrong for quoted part number", 616},
+ {"unable to fstat part file `%.250s'", 617},
+ {"file `%.250s' is corrupt - too short", 618},
+ {"cannot open archive part file `%.250s'", 619},
+ {"file `%.250s' is not an archive part", 620},
{"\
%s:\n\
Part format version: %s\n\
@@ -935,21 +934,21 @@
Part length: %lu bytes\n\
Part offset: %lu bytes\n\
Part file size (used portion): %lu bytes\n\
-\n", 622},
- {"--info requires one or more part file arguments", 623},
- {"file `%s' is not an archive part\n", 624},
- {"unable to open output file `%.250s'", 625},
- {"unable to (re)open input part file `%.250s'", 626},
- {"done\n", 627},
- {"files `%.250s' and `%.250s' are not parts of the same file", 628},
- {"there are several versions of part %d - at least `%.250s' and `%.250s'", 629},
- {"--join requires one or more part file arguments", 630},
- {"part %d is missing", 631},
- {"Debian GNU/Linux `dpkg-split' package split/join tool; version ", 632},
+\n", 621},
+ {"--info requires one or more part file arguments", 622},
+ {"file `%s' is not an archive part\n", 623},
+ {"unable to open output file `%.250s'", 624},
+ {"unable to (re)open input part file `%.250s'", 625},
+ {"done\n", 626},
+ {"files `%.250s' and `%.250s' are not parts of the same file", 627},
+ {"there are several versions of part %d - at least `%.250s' and `%.250s'", 628},
+ {"--join requires one or more part file arguments", 629},
+ {"part %d is missing", 630},
+ {"Debian GNU/Linux `dpkg-split' package split/join tool; version ", 631},
{"\
Copyright (C) 1994-1996 Ian Jackson. This is free software; see the\n\
GNU General Public Licence version 2 or later for copying conditions.\n\
-There is NO warranty. See dpkg-split --licence for details.\n", 633},
+There is NO warranty. See dpkg-split --licence for details.\n", 632},
{"\
Usage: dpkg-split -s|--split <file> [<prefix>] Split an archive.\n\
dpkg-split -j|--join <part> <part> ... Join parts together.\n\
@@ -970,43 +969,43 @@
-Q|--npquiet (be quiet when -a is not a part)\n\
--msdos (generate 8.3 filenames)\n\
\n\
-Exit status: 0 = OK; 1 = -a is not a part; 2 = trouble!\n", 634},
- {"Type dpkg-split --help for help.", 635},
- {"error reading %s", 636},
- {"error reading %.250s", 637},
- {"unexpected end of file in %.250s", 638},
- {"part size is far too large or is not positive", 639},
- {"part size must be at least %dk (to allow for header)", 640},
- {"unable to read depot directory `%.250s'", 641},
- {"--auto requires the use of the --output option", 642},
- {"--auto requires exactly one part file argument", 643},
- {"unable to read part file `%.250s'", 644},
- {"File `%.250s' is not part of a multipart archive.\n", 645},
- {"unable to reopen part file `%.250s'", 646},
- {"part file `%.250s' has trailing garbage", 647},
- {"unable to open new depot file `%.250s'", 648},
- {"unable to rename new depot file `%.250s' to `%.250s'", 649},
- {"Part %d of package %s filed (still want ", 650},
- {" and ", 651},
- {"unable to delete used-up depot file `%.250s'", 652},
- {"--listq does not take any arguments", 653},
- {"Junk files left around in the depot directory:\n", 654},
- {"unable to stat `%.250s'", 655},
- {" %s (%lu bytes)\n", 656},
- {" %s (not a plain file)\n", 657},
- {"Packages not yet reassembled:\n", 658},
- {"part file `%.250s' is not a plain file", 659},
- {"(total %lu bytes)\n", 660},
- {"unable to discard `%.250s'", 661},
- {"Deleted %s.\n", 662},
- {"--split needs a source filename argument", 663},
- {"--split takes at most a source filename and destination prefix", 664},
- {"unable to open source file `%.250s'", 665},
- {"unable to fstat source file", 666},
- {"source file `%.250s' not a plain file", 667},
- {"unable to exec mksplit", 668},
- {"%s: read error on stdin\n", 669},
- {"%s: error reading %s\n", 670},
+Exit status: 0 = OK; 1 = -a is not a part; 2 = trouble!\n", 633},
+ {"Type dpkg-split --help for help.", 634},
+ {"error reading %s", 635},
+ {"error reading %.250s", 636},
+ {"unexpected end of file in %.250s", 637},
+ {"part size is far too large or is not positive", 638},
+ {"part size must be at least %dk (to allow for header)", 639},
+ {"unable to read depot directory `%.250s'", 640},
+ {"--auto requires the use of the --output option", 641},
+ {"--auto requires exactly one part file argument", 642},
+ {"unable to read part file `%.250s'", 643},
+ {"File `%.250s' is not part of a multipart archive.\n", 644},
+ {"unable to reopen part file `%.250s'", 645},
+ {"part file `%.250s' has trailing garbage", 646},
+ {"unable to open new depot file `%.250s'", 647},
+ {"unable to rename new depot file `%.250s' to `%.250s'", 648},
+ {"Part %d of package %s filed (still want ", 649},
+ {" and ", 650},
+ {"unable to delete used-up depot file `%.250s'", 651},
+ {"--listq does not take any arguments", 652},
+ {"Junk files left around in the depot directory:\n", 653},
+ {"unable to stat `%.250s'", 654},
+ {" %s (%lu bytes)\n", 655},
+ {" %s (not a plain file)\n", 656},
+ {"Packages not yet reassembled:\n", 657},
+ {"part file `%.250s' is not a plain file", 658},
+ {"(total %lu bytes)\n", 659},
+ {"unable to discard `%.250s'", 660},
+ {"Deleted %s.\n", 661},
+ {"--split needs a source filename argument", 662},
+ {"--split takes at most a source filename and destination prefix", 663},
+ {"unable to open source file `%.250s'", 664},
+ {"unable to fstat source file", 665},
+ {"source file `%.250s' not a plain file", 666},
+ {"unable to exec mksplit", 667},
+ {"%s: read error on stdin\n", 668},
+ {"%s: error reading %s\n", 669},
{"\
usage: md5sum [-bv] [-c [file]] | [file...]\n\
Generates or checks MD5 Message Digests\n\
@@ -1014,38 +1013,38 @@
-v verbose, print file names when checking\n\
-b read files in binary mode\n\
The input for -c should be the list of message digests and file names\n\
-that is printed on stdout by this program when it generates digests.\n", 671},
- {"%s: unrecognized line: %s", 672},
- {"%s: can't open %s\n", 673},
- {"FAILED\n", 674},
- {"%s: MD5 check failed for '%s'\n", 675},
- {"OK\n", 676},
- {"%s: %d of %d file(s) failed MD5 check\n", 677},
- {"%s: no files checked\n", 678},
- {"Search for ? ", 679},
- {"Help: ", 680},
+that is printed on stdout by this program when it generates digests.\n", 670},
+ {"%s: unrecognized line: %s", 671},
+ {"%s: can't open %s\n", 672},
+ {"FAILED\n", 673},
+ {"%s: MD5 check failed for '%s'\n", 674},
+ {"OK\n", 675},
+ {"%s: %d of %d file(s) failed MD5 check\n", 676},
+ {"%s: no files checked\n", 677},
+ {"Search for ? ", 678},
+ {"Help: ", 679},
{"\
-? = help menu Space = exit help . = next help or a help page key ", 681},
- {"Help information is available under the following topics:", 682},
+? = help menu Space = exit help . = next help or a help page key ", 680},
+ {"Help information is available under the following topics:", 681},
{"\
Press a key from the list above, Space to exit help,\n\
- or `.' (full stop) to read each help page in turn. ", 683},
- {"error reading keyboard in help", 684},
- {"doupdate in SIGWINCH handler failed", 685},
- {"failed to restore old SIGWINCH sigact", 686},
- {"failed to restore old signal mask", 687},
- {"failed to get old signal mask", 688},
- {"failed to get old SIGWINCH sigact", 689},
- {"failed to block SIGWINCH", 690},
- {"failed to set new SIGWINCH sigact", 691},
- {"failed to allocate colour pairs", 692},
- {"failed to create title window", 693},
- {"failed to create whatinfo window", 694},
- {"failed to create baselist pad", 695},
- {"failed to create heading pad", 696},
- {"failed to create thisstate pad", 697},
- {"failed to create info pad", 698},
- {"failed to create query window", 699},
+ or `.' (full stop) to read each help page in turn. ", 682},
+ {"error reading keyboard in help", 683},
+ {"doupdate in SIGWINCH handler failed", 684},
+ {"failed to restore old SIGWINCH sigact", 685},
+ {"failed to restore old signal mask", 686},
+ {"failed to get old signal mask", 687},
+ {"failed to get old SIGWINCH sigact", 688},
+ {"failed to block SIGWINCH", 689},
+ {"failed to set new SIGWINCH sigact", 690},
+ {"failed to allocate colour pairs", 691},
+ {"failed to create title window", 692},
+ {"failed to create whatinfo window", 693},
+ {"failed to create baselist pad", 694},
+ {"failed to create heading pad", 695},
+ {"failed to create thisstate pad", 696},
+ {"failed to create info pad", 697},
+ {"failed to create query window", 698},
{"\
baselist::startdisplay() done ...\n\
\n\
@@ -1056,226 +1055,226 @@
\n\
colheads_row=%d, thisstate_row=%d, info_row=%d;\n\
whatinfo_row=%d, list_row=%d;\n\
-\n", 700},
- {"keybindings", 701},
- {" -- %d%%, press ", 702},
- {"%s for more", 703},
- {"%s to go back", 704},
- {"[not bound]", 705},
- {"[unk: %d]", 706},
- {"Scroll onwards through help/information", 707},
- {"Scroll backwards through help/information", 708},
- {"Move up", 709},
- {"Move down", 710},
- {"Go to top of list", 711},
- {"Go to end of list", 712},
- {"Request help (cycle through help screens)", 713},
- {"Cycle through information displays", 714},
- {"Redraw display", 715},
- {"Scroll onwards through list by 1 line", 716},
- {"Scroll backwards through list by 1 line", 717},
- {"Scroll onwards through help/information by 1 line", 718},
- {"Scroll backwards through help/information by 1 line", 719},
- {"Scroll onwards through list", 720},
- {"Scroll backwards through list", 721},
- {"Mark package(s) for installation", 722},
- {"Mark package(s) for deinstallation", 723},
- {"Mark package(s) for deinstall and purge", 724},
- {"Make highlight more specific", 725},
- {"Make highlight less specific", 726},
- {"Search for a package whose name contains a string", 727},
- {"Repeat last search.", 728},
- {"Swap sort order priority/section", 729},
- {"Quit, confirming, and checking dependencies", 730},
- {"Quit, confirming without check", 731},
- {"Quit, rejecting conflict/dependency suggestions", 732},
- {"Abort - quit without making changes", 733},
- {"Revert to old state for all packages", 734},
- {"Revert to suggested state for all packages", 735},
- {"Revert to directly requested state for all packages", 736},
- {"Select currently-highlighted access method", 737},
- {"Quit without changing selected access method", 738},
- {"Type dselect --help for help.", 739},
- {"access", 740},
- {"Choose the access method to use.", 741},
- {"update", 742},
- {"Update list of available packages, if possible.", 743},
- {"select", 744},
- {"Request which packages you want on your system.", 745},
- {"install", 746},
- {"Install and upgrade wanted packages.", 747},
- {"config", 748},
- {"Configure any packages that are unconfigured.", 749},
- {"remove", 750},
- {"Remove unwanted software.", 751},
- {"quit", 752},
- {"Quit dselect.", 753},
- {"menu", 754},
- {"Debian GNU/Linux `%s' package handling frontend.", 755},
+\n", 699},
+ {"keybindings", 700},
+ {" -- %d%%, press ", 701},
+ {"%s for more", 702},
+ {"%s to go back", 703},
+ {"[not bound]", 704},
+ {"[unk: %d]", 705},
+ {"Scroll onwards through help/information", 706},
+ {"Scroll backwards through help/information", 707},
+ {"Move up", 708},
+ {"Move down", 709},
+ {"Go to top of list", 710},
+ {"Go to end of list", 711},
+ {"Request help (cycle through help screens)", 712},
+ {"Cycle through information displays", 713},
+ {"Redraw display", 714},
+ {"Scroll onwards through list by 1 line", 715},
+ {"Scroll backwards through list by 1 line", 716},
+ {"Scroll onwards through help/information by 1 line", 717},
+ {"Scroll backwards through help/information by 1 line", 718},
+ {"Scroll onwards through list", 719},
+ {"Scroll backwards through list", 720},
+ {"Mark package(s) for installation", 721},
+ {"Mark package(s) for deinstallation", 722},
+ {"Mark package(s) for deinstall and purge", 723},
+ {"Make highlight more specific", 724},
+ {"Make highlight less specific", 725},
+ {"Search for a package whose name contains a string", 726},
+ {"Repeat last search.", 727},
+ {"Swap sort order priority/section", 728},
+ {"Quit, confirming, and checking dependencies", 729},
+ {"Quit, confirming without check", 730},
+ {"Quit, rejecting conflict/dependency suggestions", 731},
+ {"Abort - quit without making changes", 732},
+ {"Revert to old state for all packages", 733},
+ {"Revert to suggested state for all packages", 734},
+ {"Revert to directly requested state for all packages", 735},
+ {"Select currently-highlighted access method", 736},
+ {"Quit without changing selected access method", 737},
+ {"Type dselect --help for help.", 738},
+ {"access", 739},
+ {"Choose the access method to use.", 740},
+ {"update", 741},
+ {"Update list of available packages, if possible.", 742},
+ {"select", 743},
+ {"Request which packages you want on your system.", 744},
+ {"install", 745},
+ {"Install and upgrade wanted packages.", 746},
+ {"config", 747},
+ {"Configure any packages that are unconfigured.", 748},
+ {"remove", 749},
+ {"Remove unwanted software.", 750},
+ {"quit", 751},
+ {"Quit dselect.", 752},
+ {"menu", 753},
+ {"Debian GNU/Linux `%s' package handling frontend.", 754},
{"\
Version %s. Copyright (C) 1994-1996 Ian Jackson. This is\n\
free software; see the GNU General Public Licence version 2 or later for\n\
copying conditions. There is NO warranty. See dselect --licence for \
-details.\n", 756},
+details.\n", 755},
{"\
Usage: dselect [options]\n\
dselect [options] action ...\n\
Options: --admindir <directory> (default is /var/lib/dpkg)\n\
--help --version --licence --expert --debug <file> | -D<file> \
| -D\n\
-Actions: access update select install config remove quit menu\n", 757},
- {"couldn't open debug file `%.255s'\n", 758},
- {"Terminal does not appear to support cursor addressing.\n", 759},
- {"Terminal does not appear to support highlighting.\n", 760},
+Actions: access update select install config remove quit menu\n", 756},
+ {"couldn't open debug file `%.255s'\n", 757},
+ {"Terminal does not appear to support cursor addressing.\n", 758},
+ {"Terminal does not appear to support highlighting.\n", 759},
{"\
Set your TERM variable correctly, use a better terminal,\n\
-or make do with the per-package management tool ", 761},
- {"terminal lacks necessary features, giving up", 762},
+or make do with the per-package management tool ", 760},
+ {"terminal lacks necessary features, giving up", 761},
{"\
\n\
\n\
Use ^P and ^N, cursor keys, initial letters, or digits to select;\n\
Press ENTER to confirm selection. ^L to redraw screen.\n\
-\n", 763},
- {"failed to getch in main menu", 764},
- {"unknown action string `%.50s'", 765},
- {"dselect - list of access methods", 766},
- {"Access method `%s'.", 767},
- {"Abbrev.", 768},
- {"doupdate failed", 769},
- {"failed to unblock SIGWINCH", 770},
- {"failed to re-block SIGWINCH", 771},
- {"getch failed", 772},
- {"[none]", 773},
- {"explanation of ", 774},
- {"No explanation available.", 775},
- {"unable to unlock access method area", 776},
+\n", 762},
+ {"failed to getch in main menu", 763},
+ {"unknown action string `%.50s'", 764},
+ {"dselect - list of access methods", 765},
+ {"Access method `%s'.", 766},
+ {"Abbrev.", 767},
+ {"doupdate failed", 768},
+ {"failed to unblock SIGWINCH", 769},
+ {"failed to re-block SIGWINCH", 770},
+ {"getch failed", 771},
+ {"[none]", 772},
+ {"explanation of ", 773},
+ {"No explanation available.", 774},
+ {"unable to unlock access method area", 775},
{"\
No access methods are available.\n\
\n\
-Press RETURN to continue.", 777},
- {"you do not have permission to change the access method", 778},
- {"unable to open/create access method lockfile", 779},
- {"the access method area is already locked", 780},
- {"unable to lock access method area", 781},
- {"error un-catching signal %d: %s\n", 782},
- {"unable to ignore signal %d before running %.250s", 783},
- {"unable to run %.250s process `%.250s'", 784},
- {"unable to wait for %.250s", 785},
- {"got wrong child's status - asked for %ld, got %ld", 786},
- {"returned error exit status %d.\n", 787},
- {"was interrupted.\n", 788},
- {"was terminated by a signal: %s.\n", 789},
- {"(It left a coredump.)\n", 790},
- {"failed with an unknown wait return code %d.\n", 791},
- {"Press RETURN to continue.\n", 792},
- {"write error on standard error", 793},
- {"error reading acknowledgement of program failure message", 794},
+Press RETURN to continue.", 776},
+ {"you do not have permission to change the access method", 777},
+ {"unable to open/create access method lockfile", 778},
+ {"the access method area is already locked", 779},
+ {"unable to lock access method area", 780},
+ {"error un-catching signal %d: %s\n", 781},
+ {"unable to ignore signal %d before running %.250s", 782},
+ {"unable to run %.250s process `%.250s'", 783},
+ {"unable to wait for %.250s", 784},
+ {"got wrong child's status - asked for %ld, got %ld", 785},
+ {"returned error exit status %d.\n", 786},
+ {"was interrupted.\n", 787},
+ {"was terminated by a signal: %s.\n", 788},
+ {"(It left a coredump.)\n", 789},
+ {"failed with an unknown wait return code %d.\n", 790},
+ {"Press RETURN to continue.\n", 791},
+ {"write error on standard error", 792},
+ {"error reading acknowledgement of program failure message", 793},
{"\
No access method is selected/configured.\n\
\n\
-Press RETURN to continue.", 795},
- {"update available list script", 796},
- {"installation script", 797},
- {"query/setup script", 798},
- {"syntax error in method options file `%.250s' -- %s", 799},
- {"error reading options file `%.250s'", 800},
- {"unable to read `%.250s' directory for reading methods", 801},
- {"method `%.250s' has name that is too long (%d > %d characters)", 802},
- {"unable to access method script `%.250s'", 803},
- {"unable to read method options file `%.250s'", 804},
- {"non-digit where digit wanted", 805},
- {"EOF in index string", 806},
- {"index string too long", 807},
- {"newline before option name start", 808},
- {"EOF before option name start", 809},
- {"nonalpha where option name start wanted", 810},
- {"non-alphanum in option name", 811},
- {"EOF in option name", 812},
- {"newline before summary", 813},
- {"EOF before summary", 814},
- {"EOF in summary - missing newline", 815},
- {"unable to open option description file `%.250s'", 816},
- {"unable to stat option description file `%.250s'", 817},
- {"failed to read option description file `%.250s'", 818},
- {"error during read of option description file `%.250s'", 819},
- {"error during read of method options file `%.250s'", 820},
- {"unable to open current option file `%.250s'", 821},
- {"unable to open new option file `%.250s'", 822},
- {"unable to write new option to `%.250s'", 823},
- {"unable to close new option file `%.250s'", 824},
- {"unable to install new option as `%.250s'", 825},
- {"(no clientdata)", 826},
- {"new package", 827},
- {"hold", 828},
- {"purge", 829},
- {" ", 830},
- {"REINSTALL", 831},
- {"unpacked (not set up)", 832},
- {"failed config", 833},
- {"half installed", 834},
- {"removed (configs remain)", 835},
- {"Required", 836},
- {"Important", 837},
- {"Standard", 838},
- {"Recommended", 839},
- {"Optional", 840},
- {"Extra", 841},
- {"Contrib", 842},
- {"!Bug!", 843},
- {"Unclassified", 844},
- {"suggests", 845},
- {"recommends", 846},
- {"depends on", 847},
- {"pre-depends on", 848},
- {"conflicts with", 849},
- {"provides", 850},
- {"replaces", 851},
- {"enhances", 852},
- {"Req", 853},
- {"Imp", 854},
- {"Std", 855},
- {"Rec", 856},
- {"Opt", 857},
- {"Xtr", 858},
- {"Ctb", 859},
- {"bUG", 860},
- {"?", 861},
- {"Broken", 862},
- {"New", 863},
- {"Updated", 864},
- {"Obsolete/local", 865},
- {"Up-to-date", 866},
- {"Available", 867},
- {"Removed", 868},
- {"Brokenly installed packages", 869},
- {"Newly available packages", 870},
- {"Updated packages (newer version is available)", 871},
- {"Obsolete and local packages present on system", 872},
- {"Up to date installed packages", 873},
- {"Available packages (not currently installed)", 874},
- {"Removed and no longer available packages", 875},
- {"Installed packages", 876},
- {"Removed packages (configuration still present)", 877},
- {"Purged packages and those never installed", 878},
- {"Installed", 879},
- {"Purged", 880},
- {"dselect - recursive package listing", 881},
- {"dselect - inspection of package states", 882},
- {"dselect - main package listing", 883},
- {" (by section)", 884},
- {" (avail., section)", 885},
- {" (status, section)", 886},
- {" (by priority)", 887},
- {" (avail., priority)", 888},
- {" (status, priority)", 889},
- {" (alphabetically)", 890},
- {" (by availability)", 891},
- {" (by status)", 892},
- {" mark:+/=/- terse:v help:?", 893},
- {" mark:+/=/- verbose:v help:?", 894},
- {" terse:v help:?", 895},
- {" verbose:v help:?", 896},
+Press RETURN to continue.", 794},
+ {"update available list script", 795},
+ {"installation script", 796},
+ {"query/setup script", 797},
+ {"syntax error in method options file `%.250s' -- %s", 798},
+ {"error reading options file `%.250s'", 799},
+ {"unable to read `%.250s' directory for reading methods", 800},
+ {"method `%.250s' has name that is too long (%d > %d characters)", 801},
+ {"unable to access method script `%.250s'", 802},
+ {"unable to read method options file `%.250s'", 803},
+ {"non-digit where digit wanted", 804},
+ {"EOF in index string", 805},
+ {"index string too long", 806},
+ {"newline before option name start", 807},
+ {"EOF before option name start", 808},
+ {"nonalpha where option name start wanted", 809},
+ {"non-alphanum in option name", 810},
+ {"EOF in option name", 811},
+ {"newline before summary", 812},
+ {"EOF before summary", 813},
+ {"EOF in summary - missing newline", 814},
+ {"unable to open option description file `%.250s'", 815},
+ {"unable to stat option description file `%.250s'", 816},
+ {"failed to read option description file `%.250s'", 817},
+ {"error during read of option description file `%.250s'", 818},
+ {"error during read of method options file `%.250s'", 819},
+ {"unable to open current option file `%.250s'", 820},
+ {"unable to open new option file `%.250s'", 821},
+ {"unable to write new option to `%.250s'", 822},
+ {"unable to close new option file `%.250s'", 823},
+ {"unable to install new option as `%.250s'", 824},
+ {"(no clientdata)", 825},
+ {"new package", 826},
+ {"hold", 827},
+ {"purge", 828},
+ {" ", 829},
+ {"REINSTALL", 830},
+ {"unpacked (not set up)", 831},
+ {"failed config", 832},
+ {"half installed", 833},
+ {"removed (configs remain)", 834},
+ {"Required", 835},
+ {"Important", 836},
+ {"Standard", 837},
+ {"Recommended", 838},
+ {"Optional", 839},
+ {"Extra", 840},
+ {"Contrib", 841},
+ {"!Bug!", 842},
+ {"Unclassified", 843},
+ {"suggests", 844},
+ {"recommends", 845},
+ {"depends on", 846},
+ {"pre-depends on", 847},
+ {"conflicts with", 848},
+ {"provides", 849},
+ {"replaces", 850},
+ {"enhances", 851},
+ {"Req", 852},
+ {"Imp", 853},
+ {"Std", 854},
+ {"Rec", 855},
+ {"Opt", 856},
+ {"Xtr", 857},
+ {"Ctb", 858},
+ {"bUG", 859},
+ {"?", 860},
+ {"Broken", 861},
+ {"New", 862},
+ {"Updated", 863},
+ {"Obsolete/local", 864},
+ {"Up-to-date", 865},
+ {"Available", 866},
+ {"Removed", 867},
+ {"Brokenly installed packages", 868},
+ {"Newly available packages", 869},
+ {"Updated packages (newer version is available)", 870},
+ {"Obsolete and local packages present on system", 871},
+ {"Up to date installed packages", 872},
+ {"Available packages (not currently installed)", 873},
+ {"Removed and no longer available packages", 874},
+ {"Installed packages", 875},
+ {"Removed packages (configuration still present)", 876},
+ {"Purged packages and those never installed", 877},
+ {"Installed", 878},
+ {"Purged", 879},
+ {"dselect - recursive package listing", 880},
+ {"dselect - inspection of package states", 881},
+ {"dselect - main package listing", 882},
+ {" (by section)", 883},
+ {" (avail., section)", 884},
+ {" (status, section)", 885},
+ {" (by priority)", 886},
+ {" (avail., priority)", 887},
+ {" (status, priority)", 888},
+ {" (alphabetically)", 889},
+ {" (by availability)", 890},
+ {" (by status)", 891},
+ {" mark:+/=/- terse:v help:?", 892},
+ {" mark:+/=/- verbose:v help:?", 893},
+ {" terse:v help:?", 894},
+ {" verbose:v help:?", 895},
{"\
The line you have highlighted represents many packages; if you ask to \
install, remove, hold, &c it you will affect all the packages which match \
@@ -1284,33 +1283,33 @@
If you move the highlight to a line for a particular package you will see \
information about that package displayed here.\n\
You can use `o' and `O' to change the sort order and give yourself the \
-opportunity to mark packages in different kinds of groups.", 897},
- {"interrelationships affecting ", 898},
- {"interrelationships", 899},
- {"description of ", 900},
- {"no description available.", 901},
- {"description", 902},
- {"currently installed control info", 903},
- {"installed control info for ", 904},
- {"available version of control file info", 905},
- {"available version of control info for ", 906},
- {"<null>", 907},
- {"All", 908},
- {"All packages", 909},
- {"%s packages without a section", 910},
- {"%s packages in section %s", 911},
- {"%s %s packages", 912},
- {"%s %s packages without a section", 913},
- {"%s %s packages in section %s", 914},
- {"%-*s %s%s%s; %s (was: %s). %s", 915},
- {"Error", 916},
- {"Installed?", 917},
- {"Old mark", 918},
- {"Marked for", 919},
- {"Section", 920},
- {"Priority", 921},
- {"Package", 922},
- {"Keystrokes", 923},
+opportunity to mark packages in different kinds of groups.", 896},
+ {"interrelationships affecting ", 897},
+ {"interrelationships", 898},
+ {"description of ", 899},
+ {"no description available.", 900},
+ {"description", 901},
+ {"currently installed control info", 902},
+ {"installed control info for ", 903},
+ {"available version of control file info", 904},
+ {"available version of control info for ", 905},
+ {"<null>", 906},
+ {"All", 907},
+ {"All packages", 908},
+ {"%s packages without a section", 909},
+ {"%s packages in section %s", 910},
+ {"%s %s packages", 911},
+ {"%s %s packages without a section", 912},
+ {"%s %s packages in section %s", 913},
+ {"%-*s %s%s%s; %s (was: %s). %s", 914},
+ {"Error", 915},
+ {"Installed?", 916},
+ {"Old mark", 917},
+ {"Marked for", 918},
+ {"Section", 919},
+ {"Priority", 920},
+ {"Package", 921},
+ {"Keystrokes", 922},
{"\
Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
n, Down-arrow, j p, Up-arrow, k move highlight\n\
@@ -1339,8 +1338,8 @@
R Revert to state before this list ^l redraw display\n\
U set all to sUggested state / search (Return to \
cancel)\n\
- D set all to Directly requested state \\ repeat last search\n", 924},
- {"Introduction to package list", 925},
+ D set all to Directly requested state \\ repeat last search\n", 923},
+ {"Introduction to package list", 924},
{"\
Welcome to the main package listing. Please read the help that is available \
!\n\
@@ -1373,8 +1372,8 @@
dependencies will be done - here too you may see a sublist.\n\
\n\
Press Space to leave help and enter the list; press `?' at any time for \
-help.\n", 926},
- {"Introduction to package list browser (read-only)", 927},
+help.\n", 925},
+ {"Introduction to package list browser (read-only)", 926},
{"\
Welcome to dselect's main package listing. Since you do not have the\n\
privilege necessary to update package states you are in read-only mode.\n\
@@ -1395,8 +1394,8 @@
\n\
Press Space to leave help and enter the list; press `?' at any time for \
help.\n\
-When you have finished browsing, press `q' or Return to quit.\n", 928},
- {"Introduction to conflict/dependency resolution sub-list", 929},
+When you have finished browsing, press `q' or Return to quit.\n", 927},
+ {"Introduction to conflict/dependency resolution sub-list", 928},
{"\
Dependency/conflict resolution - introduction.\n\
\n\
@@ -1428,8 +1427,8 @@
override a recommendation or think that the program is mistaken.\n\
\n\
Press Space to leave help and enter the sub-list; remember: press `?' for \
-help.\n", 930},
- {"Display, part 1: package listing and status chars", 931},
+help.\n", 929},
+ {"Display, part 1: package listing and status chars", 930},
{"\
The top half of the screen shows a list of packages. For each package you \
see\n\
@@ -1458,8 +1457,8 @@
\n\
Also displayed are each package's Priority, Section, name, installed and\n\
available version numbers (shift-V to display/hide) and summary \
-description.\n", 932},
- {"Display, part 2: list highlight; information display", 933},
+description.\n", 931},
+ {"Display, part 2: list highlight; information display", 932},
{"\
* Highlight: One line in the package list will be highlighted. It \
indicates\n\
@@ -1483,8 +1482,8 @@
current package (in conflict/dependency resolution sublists).\n\
\n\
Use the `i' key to cycle through the displays, and `I' to hide the\n\
- information display or expand it to use almost all of the screen.\n", 934},
- {"Introduction to method selection display", 935},
+ information display or expand it to use almost all of the screen.\n", 933},
+ {"Introduction to method selection display", 934},
{"\
dselect and dpkg can do automatic installation, loading the package files to \
be\n\
@@ -1505,8 +1504,8 @@
\n\
A full list of keystrokes is available by pressing `k' now, or from the \
help\n\
-menu reachable by pressing `?'.\n", 936},
- {"Keystrokes for method selection", 937},
+menu reachable by pressing `?'.\n", 935},
+ {"Keystrokes for method selection", 936},
{"\
Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
n, Down-arrow p, Up-arrow move highlight\n\
@@ -1528,7 +1527,7 @@
?, Help, F1 request help\n\
^l redraw display\n\
/ search (just return to cancel)\n\
- \\ repeat last search\n", 938},
+ \\ repeat last search\n", 937},
};
-int _msg_tbl_length = 938;
+int _msg_tbl_length = 937;
diff -ruN --exclude build dpkg-1.6.5.1/po/dpkg.pot dpkg-1.6.5.2/po/dpkg.pot
--- dpkg-1.6.5.1/po/dpkg.pot Mon Jan 3 17:56:47 2000
+++ dpkg-1.6.5.2/po/dpkg.pot Mon Jan 3 17:34:58 2000
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-03 17:56-0600\n"
+"POT-Creation-Date: 2000-01-03 17:34-0600\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"
@@ -2697,7 +2697,7 @@
msgid "unable to unbuffer `%.255s'"
msgstr ""
-#: dpkg-deb/build.c:213 dpkg-deb/build.c:272 dpkg-deb/build.c:280
+#: dpkg-deb/build.c:213 dpkg-deb/build.c:272
#, c-format
msgid "failed to chdir to `%.255s'"
msgstr ""
@@ -2757,26 +2757,22 @@
msgstr ""
#: dpkg-deb/build.c:274
-msgid "failed to exec dpkg-deb-filelist"
-msgstr ""
-
-#: dpkg-deb/build.c:282
msgid "failed to exec tar --exclude"
msgstr ""
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:284
msgid "no compression copy loop"
msgstr ""
-#: dpkg-deb/build.c:299
+#: dpkg-deb/build.c:290
msgid "failed to exec gzip -9c from tar --exclude"
msgstr ""
-#: dpkg-deb/build.c:315
+#: dpkg-deb/build.c:305
msgid "failed to rewind tmpfile (data)"
msgstr ""
-#: dpkg-deb/build.c:316
+#: dpkg-deb/build.c:306
msgid "data"
msgstr ""
===
----BEGIN GEEK CODE BLOCK----
Version: 3.12
GCS d- s: a-- c+++ UL++++ P+ L++++ !E W+ M o+ K- W--- !O M- !V PS--
PE++ Y+ PGP++ t* 5++ X+ tv b+ D++ G e h*! !r z?
-----END GEEK CODE BLOCK-----
----BEGIN PGP INFO----
Adam Heath <doogie@debian.org> Finger Print | KeyID
67 01 42 93 CA 37 FB 1E 63 C9 80 1D 08 CF 84 0A | DE656B05 PGP
AD46 C888 F587 F8A3 A6DA 3261 8A2C 7DC2 8BD4 A489 | 8BD4A489 GPG
-----END PGP INFO-----
Reply to: