dselect/method.cc: pass admindir to dpkg

dselect/Makefile.in: fix rule to build helpmessages
dselect/curkeys.h: use curses.h instead of ncurses.h, since someone decided to play nasty and just remove that
scripts/: remove dpkg-safelist
dpkg-deb/build.c: remove dpkg-safelist calls
main/enquiry.c: redo formula to get fieldwidths for packages

diff --git a/ChangeLog b/ChangeLog
index bec983f39dea61eace43d2609bf461d3ca4434e5..cf5839709f767e5266e29bb51b93ef32d9a3f0e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jan  7 18:24:45 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * dselect/method.cc: pass admindir to dpkg
+  * dselect/Makefile.in: fix rule to build helpmessages
+  * dselect/curkeys.h: use curses.h instead of ncurses.h, since someone
+    decided to play nasty and just remove that
+  * scripts/: remove dpkg-safelist
+  * dpkg-deb/build.c: remove dpkg-safelist calls
+  * main/enquiry.c: redo formula to get fieldwidths for packages
+
 Wed Jan  5 17:09:45 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * Merge patch from Tom Lees <tom@lpsg.demon.co.uk>:

diff --git a/debian/changelog b/debian/changelog
index 9cd6d72d8f409a59da622b178334a8d4b0764848..7e41df8a1d31951d704e98f5b374706dc024a208 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 dpkg (1.6.6) unstable; urgency=low
 
-  * dpkg-buildpackage supports debsign, Closes: Bug# 58333
-  * fix update-alternatives manpage, Closes: Bug# 53859
+  * dpkg-buildpackage supports debsign, Closes: Bug#58333
+  * fix update-alternatives manpage, Closes: Bug#53859
   * Updated Polish translation
+  * Pass admindir to dpkg, Closes: Bug#54039
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/debian/rules b/debian/rules
index 8b7180ba60b32c83910680716511e43910c3fbc3..57f45e77c2937c365f701b0cd02000e65c900346 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -129,15 +129,14 @@ binary-dpkg-dev: stamp-binary
        set -e ; for i in dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \
                dpkg-shlibdeps dpkg-buildpackage dpkg-distaddfile 822-date \
                dpkg-scanpackages dpkg-scansources dpkg-architecture \
-               dpkg-parsechangelog dpkg-safefilelist ; do \
+               dpkg-parsechangelog ; do \
                mv $(TMP)/usr/bin/$$i $(TMP_DPKG_DEV)/usr/bin/ ; \
        done
        set -e ; for i in "" ja ; do \
                install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man1 ; \
                for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \
                        dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \
-                       dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 \
-                       dpkg-safefilelist.1 ; do \
+                       dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 ; do \
                        if [ -e $(TMP)/usr/share/man/$$i/man1/$$m ] ; then \
                                mv $(TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man1/$$m ; \
                        fi ; \

diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 8e2581e416b8fcbb2c558a8f003d6938fc3ea787..79c0d1d213c263802e520d474a1222565f1b9a6f 100644 (file)
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -266,42 +266,32 @@ void do_build(const char *const *argv) {
     strcpy(tfbuf,envbuf);
     strcat(tfbuf,"/dpkg.XXXXXX");
   }
-  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]);
   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]);
   if (!(c5= m_fork())) {
     char *combuf;
     m_dup2(p2[0],0); close(p2[0]);
     m_dup2(oldformatflag ? fileno(ar) : gzfd,1);
     combuf = strdup("-9c");
     if(compression != NULL) {
-      if(*compression = '0') {
+      if(*compression == '0') {
        do_fd_copy(0, 1, _("no compression copy loop"));
        exit(0);
       }
       combuf[1] = *compression;
     }
     execlp(GZIP,"gzip",combuf,(char*)0);
-    ohshite(_("failed to exec gzip -9c from tar --exclude"));
+    ohshite(_("failed to exec gzip %s from tar --exclude"), combuf);
   }
   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,
@@ -313,7 +303,11 @@ void do_build(const char *const *argv) {
       werr(debar);
 
     if (lseek(gzfd,0,SEEK_SET)) ohshite(_("failed to rewind tmpfile (data)"));
-    do_fd_copy(gzfd, fileno(ar), _("data"));
+    if (!(c3= m_fork())) {
+      m_dup2(gzfd,0); m_dup2(fileno(ar),1);
+      execlp(CAT,"cat",(char*)0); ohshite(_("failed to exec cat (data)"));
+    }
+    waitsubproc(c3,"cat (data)",0);
 
     if (datastab.st_size & 1)
       if (putc('\n',ar) == EOF)

diff --git a/dselect/Makefile.in b/dselect/Makefile.in
index 6f656198fe49cb3dfb82cb177b1bfc07a766af14..3eefba7a22a044af6a1671b01d7bc1430d60560e 100644 (file)
--- a/dselect/Makefile.in
+++ b/dselect/Makefile.in
@@ -52,7 +52,7 @@ basecmds.o: helpmsgs.h
 curkeys.o: curkeys.h
 
 $(srcdir)/helpmsgs.h $(srcdir)/helpmsgs.cc: helpmsgs.src $(srcdir)/mkhelpmsgs.pl
-       cd $(srcdir) ; perl $(srcdir)/mkhelpmsgs.pl $<
+       cd $(srcdir) ; perl mkhelpmsgs.pl helpmsgs.src
 
 curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
        cursesfile=`echo '#include <curses.h>' | \

diff --git a/dselect/curkeys.cc b/dselect/curkeys.cc
index f22c9b680fa0c06b11d9fdcb134533a1bba56a43..d25ab7034b2424bd548168de00780d2ad7e83752 100644 (file)
--- a/dselect/curkeys.cc
+++ b/dselect/curkeys.cc
@@ -20,7 +20,7 @@
  */
 
 extern "C" {
-#include <ncurses/curses.h>
+#include <curses.h>
 #include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>

diff --git a/dselect/method.cc b/dselect/method.cc
index 27e1dc2cf29aa5610e5e844c4bd40ec6798176e2..5295fd4814225b88a1c332e36fb0acbb162ef0ca 100644 (file)
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -221,6 +221,8 @@ urqresult urq_install(void) {
 static urqresult rundpkgauto(const char *name, const char *dpkgmode) {
   const char *fallibleargs[] = {
     DPKG,
+       "--admindir",
+       admindir,
     "--pending",
     dpkgmode,
     0

diff --git a/main/enquiry.c b/main/enquiry.c
index eec32bbaf47cf598a2b42040f67bf0213ea70894..af502ba0ad9953baf49a3d285b19061fc1613bf7 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -74,13 +74,17 @@ static int getttywidth() {
 
 static void list1package(struct pkginfo *pkg, int *head) {
   int l,w;
+  int nw,vw,dw;
   const char *pdesc;
   char format[80];
     
-  w=getttywidth()-(3+1+15+1+14+1+44); /* get spare width */
-  if (w<80) w=80; /* lets not try to deal with terminals that are too small */
-  w>>=1; /* halve that so we can add that to the both the name and description */
-  sprintf(format,"%%c%%c%%c %%-%d.%ds %%-14.14s %%.*s\n", (14+w), (14+w));
+  w=getttywidth()-80;  /* get spare width */
+  if (w<0) w=0;                /* lets not try to deal with terminals that are too small */
+  w>>=2;               /* halve that so we can add that to the both the name and description */
+  nw=(14+w);           /* name width */
+  vw=(14+w);           /* version width */
+  dw=(44+(2*w));       /* description width */
+  sprintf(format,"%%c%%c%%c %%-%d.%ds %%-%d.%ds %%.*s\n", nw, nw, vw, vw);
 
   if (!*head) {
     fputs(_("\
@@ -88,15 +92,15 @@ Desired=Unknown/Install/Remove/Purge\n\
 | Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n\
 |/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"), stdout);
     printf(format,'|','|','/', _("Name"), _("Version"), 40, _("Description"));
-    printf("+++-");
-    for (l=0;l<(14+w);l++) printf("="); printf("-");
-    printf("==============-");
-    for (l=0;l<(44+w);l++) printf("="); 
+    printf("+++-");                                    /* status */
+    for (l=0;l<nw;l++) printf("="); printf("-");       /* packagename */
+    for (l=0;l<vw;l++) printf("="); printf("-");       /* version */
+    for (l=0;l<dw;l++) printf("=");                    /* description */
     printf("\n");
     *head= 1;
   }
   if (!pkg->installed.valid) blankpackageperfile(&pkg->installed);
-  limiteddescription(pkg,(44+w),&pdesc,&l);
+  limiteddescription(pkg,dw,&pdesc,&l);
   printf(format,
          "uihrp"[pkg->want],
          "nUFiHc"[pkg->status],

diff --git a/po/dpkg.pot b/po/dpkg.pot
index 43ab2dc764ac081c70a4a8bcf59202d9d55616a5..9794fd0898d6d8d4c4096811d66f3c98ea36c2a4 100644 (file)
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -2,12 +2,11 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: dselect/pkgdisplay.cc:45
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-05 18:52+0100\n"
+"POT-Creation-Date: 2000-01-07 19:29+0100\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"
@@ -449,6 +448,33 @@ msgstr ""
 msgid "wait for %s failed"
 msgstr ""
 
+#: lib/mlib.c:129
+#, c-format
+msgid "failed to allocate buffer for copy (%s)"
+msgstr ""
+
+#: lib/mlib.c:130
+#, c-format
+msgid "failed in copy on write (%s)"
+msgstr ""
+
+#: lib/mlib.c:131
+#, c-format
+msgid "failed in copy on read (%s)"
+msgstr ""
+
+#: lib/mlib.c:136
+msgid "failed to allocate buffer for snprintf 1"
+msgstr ""
+
+#: lib/mlib.c:148 lib/mlib.c:160
+msgid "failed to allocate buffer for snprintf 2"
+msgstr ""
+
+#: lib/mlib.c:165
+msgid "failed in copy on read (control)"
+msgstr ""
+
 #: lib/myopt.c:48
 #, c-format
 msgid "unknown option --%s"
@@ -635,8 +661,8 @@ msgstr ""
 msgid "cannot open GPL file "
 msgstr ""
 
-#: lib/showcright.c:34
-msgid "unable to exec cat for displaying GPL file"
+#: lib/showcright.c:32
+msgid "showcopyright"
 msgstr ""
 
 #: lib/varbuf.c:77
@@ -1284,57 +1310,57 @@ msgstr ""
 msgid " enhances "
 msgstr ""
 
-#: main/depcon.c:211
+#: main/depcon.c:212
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: main/depcon.c:214
+#: main/depcon.c:215
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: main/depcon.c:218
+#: main/depcon.c:219
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:226
+#: main/depcon.c:227
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:241
+#: main/depcon.c:242
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: main/depcon.c:245
+#: main/depcon.c:246
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:251
+#: main/depcon.c:252
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:260
+#: main/depcon.c:261
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: main/depcon.c:296
+#: main/depcon.c:297
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: main/depcon.c:300
+#: main/depcon.c:301
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: main/depcon.c:305
+#: main/depcon.c:306
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
@@ -1342,265 +1368,274 @@ 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.
 #.
-#: main/depcon.c:319
+#: main/depcon.c:320
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: main/depcon.c:350
+#: main/depcon.c:351
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: main/depcon.c:364
+#: main/depcon.c:365
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
 #. conflicts and provides the same
-#: main/depcon.c:389
+#: main/depcon.c:390
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: main/depcon.c:420
+#: main/depcon.c:421
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
 
-#: main/enquiry.c:51
+#: main/enquiry.c:55
 msgid "(no description available)"
 msgstr ""
 
-#: main/enquiry.c:63
+#: main/enquiry.c:86
 msgid ""
 "Desired=Unknown/Install/Remove/Purge\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
 "|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
 "uppercase=bad)\n"
-"||/ Name            Version        Description\n"
-"+++-===============-==============-=========================================="
-"==\n"
 msgstr ""
 
-#: main/enquiry.c:121 main/select.c:80
+#: main/enquiry.c:90
+msgid "Name"
+msgstr ""
+
+#: main/enquiry.c:90
+msgid "Version"
+msgstr ""
+
+#: dselect/methlist.cc:112 dselect/pkgtop.cc:296 main/enquiry.c:90
+msgid "Description"
+msgstr ""
+
+#: main/enquiry.c:146 main/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr ""
 
-#: main/enquiry.c:146
+#: main/enquiry.c:171
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
 "installation.  They must be reinstalled for them (and any packages\n"
 "that depend on them) to function properly:\n"
 msgstr ""
 
-#: main/enquiry.c:151
+#: main/enquiry.c:176
 msgid ""
 "The following packages have been unpacked but not yet configured.\n"
 "They must be configured using dpkg --configure or the configure\n"
 "menu option in dselect for them to work:\n"
 msgstr ""
 
-#: main/enquiry.c:156
+#: main/enquiry.c:181
 msgid ""
 "The following packages are only half configured, probably due to problems\n"
 "configuring them the first time.  The configuration should be retried using\n"
 "dpkg --configure <package> or the configure menu option in "
 msgstr ""
 
-#: main/enquiry.c:161
+#: main/enquiry.c:186
 msgid ""
 "The following packages are only half installed, due to problems during\n"
 "installation.  The installation can probably be completed by retrying it;\n"
 "the packages can be removed using dselect or dpkg --remove:\n"
 msgstr ""
 
-#: main/enquiry.c:186
+#: main/enquiry.c:211
 msgid "--audit does not take any arguments"
 msgstr ""
 
-#: main/enquiry.c:221
+#: main/enquiry.c:246
 msgid "<unknown>"
 msgstr ""
 
-#: main/enquiry.c:237
+#: main/enquiry.c:262
 msgid "--yet-to-unpack does not take any arguments"
 msgstr ""
 
-#: main/enquiry.c:275
+#: main/enquiry.c:300
 #, c-format
 msgid " %d in %s: "
 msgstr ""
 
-#: main/enquiry.c:290
+#: main/enquiry.c:315
 #, c-format
 msgid " %d packages, from the following sections:"
 msgstr ""
 
-#: main/enquiry.c:310
+#: main/enquiry.c:335
 #, c-format
 msgid "diversion by %s"
 msgstr ""
 
-#: main/enquiry.c:311
+#: main/enquiry.c:336
 msgid "local diversion"
 msgstr ""
 
-#: main/enquiry.c:312
+#: main/enquiry.c:337
 msgid "to"
 msgstr ""
 
-#: main/enquiry.c:312
+#: main/enquiry.c:337
 msgid "from"
 msgstr ""
 
-#: main/enquiry.c:345
+#: main/enquiry.c:370
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: main/enquiry.c:373
+#: main/enquiry.c:398
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr ""
 
-#: main/enquiry.c:389 main/packages.c:109
+#: main/enquiry.c:414 main/packages.c:109
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
 
-#: main/enquiry.c:409
+#: main/enquiry.c:434
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: main/enquiry.c:418
+#: main/enquiry.c:443
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr ""
 
-#: main/enquiry.c:428
+#: main/enquiry.c:453
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr ""
 
-#: main/enquiry.c:437
+#: main/enquiry.c:462
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: main/enquiry.c:443
+#: main/enquiry.c:468
 msgid "locally diverted"
 msgstr ""
 
-#: main/enquiry.c:444
+#: main/enquiry.c:469
 msgid "package diverts others"
 msgstr ""
 
-#: main/enquiry.c:445
+#: main/enquiry.c:470
 #, c-format
 msgid "diverted by %s"
 msgstr ""
 
-#: main/enquiry.c:464
+#: main/enquiry.c:489
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents."
 msgstr ""
 
-#: main/enquiry.c:475
+#: main/enquiry.c:500
 msgid "--assert-* does not take any arguments"
 msgstr ""
 
-#: main/enquiry.c:490
+#: main/enquiry.c:515
 msgid ""
 "Version of dpkg with working epoch support not yet configured.\n"
 " Please use `dpkg --configure dpkg', and then try again.\n"
 msgstr ""
 
-#: main/enquiry.c:494
+#: main/enquiry.c:519
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
 msgstr ""
 
-#: main/enquiry.c:537
+#: main/enquiry.c:562
 msgid "--predep-package does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:589
+#: main/enquiry.c:614
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 msgstr ""
 
-#: main/enquiry.c:590
+#: main/enquiry.c:615
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: main/enquiry.c:610
+#: main/enquiry.c:635
 #, c-format
 msgid ""
 "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
 " `%s'\n"
 msgstr ""
 
-#: main/enquiry.c:613
+#: main/enquiry.c:638
 #, c-format
 msgid "compiler libgcc filename not understood: %.250s"
 msgstr ""
 
-#: main/enquiry.c:617
+#: main/enquiry.c:642
 msgid "--print-installation-architecture does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:637
+#: main/enquiry.c:662
 msgid "--print-architecture does not take any argument"
 msgstr ""
 
-#: main/enquiry.c:643
+#: main/enquiry.c:668
 msgid "failed to fdopen CC pipe"
 msgstr ""
 
-#: main/enquiry.c:662
+#: main/enquiry.c:687
 msgid "error reading from CC pipe"
 msgstr ""
 
-#: main/enquiry.c:664
+#: main/enquiry.c:689
 msgid "empty output"
 msgstr ""
 
-#: main/enquiry.c:666
+#: main/enquiry.c:691
 msgid "no newline"
 msgstr ""
 
-#: main/enquiry.c:669
+#: main/enquiry.c:694
 msgid "no gcc-lib component"
 msgstr ""
 
-#: main/enquiry.c:671
+#: main/enquiry.c:696
 msgid "no hyphen after gcc-lib"
 msgstr ""
 
-#: main/enquiry.c:683
+#: main/enquiry.c:708
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr ""
 
-#: main/enquiry.c:725
+#: main/enquiry.c:750
 msgid "--cmpversions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: main/enquiry.c:730
+#: main/enquiry.c:755
 msgid "--cmpversions bad relation"
 msgstr ""
 
-#: main/enquiry.c:735
+#: main/enquiry.c:760
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr ""
 
-#: main/enquiry.c:745
+#: main/enquiry.c:770
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr ""
@@ -1773,7 +1808,7 @@ msgstr ""
 msgid "read error in diversions [i]"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:49 main/help.c:41
+#: dselect/pkgdisplay.cc:51 main/help.c:41
 msgid "not installed"
 msgstr ""
 
@@ -1785,7 +1820,7 @@ msgstr ""
 msgid "broken due to postinst failure"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:52 main/help.c:44
+#: dselect/pkgdisplay.cc:54 main/help.c:44
 msgid "installed"
 msgstr ""
 
@@ -1910,18 +1945,22 @@ msgstr ""
 msgid "failed to exec rm for cleanup"
 msgstr ""
 
-#: main/main.c:44
-msgid "Debian Linux `dpkg' package management program version "
+#: dpkg-deb/main.c:44 main/main.c:44
+msgid "Debian GNU/Linux `"
+msgstr ""
+
+#: main/main.c:46
+msgid "' package management program version "
 msgstr ""
 
-#: main/main.c:47
+#: main/main.c:48
 msgid ""
-"Copyright 1994-1996 Ian Jackson, Bruce Perens.  This is free software;\n"
-"see the GNU General Public Licence version 2 or later for copying\n"
-"conditions.  There is NO warranty.  See dpkg --licence for details.\n"
+"This is free software; see the GNU General Public Licence version 2 or\n"
+"later for copying conditions.  There is NO warranty.\n"
+"See dpkg --licence for copyright and license details.\n"
 msgstr ""
 
-#: main/main.c:57
+#: main/main.c:58
 #, c-format
 msgid ""
 "Usage: \n"
@@ -1990,7 +2029,7 @@ msgid ""
 "Use `dselect' for user-friendly package management.\n"
 msgstr ""
 
-#: main/main.c:117
+#: main/main.c:118
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use dselect for user-friendly package management;\n"
@@ -2004,12 +2043,12 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: dpkg-deb/main.c:130 main/main.c:178 split/main.c:142
+#: dpkg-deb/main.c:133 main/main.c:179 split/main.c:142
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr ""
 
-#: main/main.c:187
+#: main/main.c:188
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2030,26 +2069,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: main/main.c:206
+#: main/main.c:207
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: main/main.c:230
+#: main/main.c:231
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: main/main.c:236
+#: main/main.c:237
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: main/main.c:252
+#: main/main.c:253
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: main/main.c:262
+#: main/main.c:263
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2087,16 +2126,16 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: main/main.c:301
+#: main/main.c:302
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: main/main.c:380
+#: main/main.c:381
 msgid "failed to exec dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/main.c:150 main/main.c:416 split/main.c:163
+#: dpkg-deb/main.c:153 main/main.c:417 split/main.c:163
 msgid "need an action option"
 msgstr ""
 
@@ -2658,7 +2697,7 @@ msgstr ""
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:213 dpkg-deb/build.c:276
+#: dpkg-deb/build.c:213 dpkg-deb/build.c:272
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
@@ -2698,38 +2737,43 @@ msgstr ""
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:257
-msgid "failed to exec cat (control)"
+#: dpkg-deb/build.c:255
+msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:263
+#: dpkg-deb/build.c:259
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:264
+#: dpkg-deb/build.c:260
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr ""
 
 #. make sure it's gone, the fd will remain until we close it
-#: dpkg-deb/build.c:267
+#: dpkg-deb/build.c:263
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:274
 msgid "failed to exec tar --exclude"
 msgstr ""
 
-#: dpkg-deb/build.c:285
-msgid "failed to exec gzip -9c from tar --exclude"
+#: dpkg-deb/build.c:284
+msgid "no compression copy loop"
 msgstr ""
 
-#: dpkg-deb/build.c:300
+#: dpkg-deb/build.c:290
+#, c-format
+msgid "failed to exec gzip %s from tar --exclude"
+msgstr ""
+
+#: dpkg-deb/build.c:305
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:303
+#: dpkg-deb/build.c:308
 msgid "failed to exec cat (data)"
 msgstr ""
 
@@ -2937,79 +2981,75 @@ msgstr ""
 msgid "failed to exec rm -rf"
 msgstr ""
 
-#: dpkg-deb/info.c:95
-msgid "failed to exec cat component"
+#: dpkg-deb/info.c:93
+msgid "info_spew"
 msgstr ""
 
-#: dpkg-deb/info.c:99
+#: dpkg-deb/info.c:95
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:103
+#: dpkg-deb/info.c:99
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:107
+#: dpkg-deb/info.c:103
 msgid "at least one requested control component missing"
 msgstr ""
 
-#: dpkg-deb/info.c:120
+#: dpkg-deb/info.c:116
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:125
+#: dpkg-deb/info.c:121
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:128
+#: dpkg-deb/info.c:124
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:142
+#: dpkg-deb/info.c:138
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:145
+#: dpkg-deb/info.c:141
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:151
+#: dpkg-deb/info.c:147
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:156
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "failed to read `control' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:157
+#: dpkg-deb/info.c:153
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:177
+#: dpkg-deb/info.c:173
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:207
+#: dpkg-deb/info.c:203
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:239
+#: dpkg-deb/info.c:235
 msgid "--contents takes exactly one argument"
 msgstr ""
 
-#: dpkg-deb/main.c:44
-msgid "Debian Linux `"
-msgstr ""
-
 #: dpkg-deb/main.c:46
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
@@ -3035,13 +3075,14 @@ msgid ""
 "<cfield> is the name of a field in the main `control' file.\n"
 "Options:  -D for debugging output; --old or --new controls archive format;\n"
 "          --nocheck to suppress control file check (build bad package).\n"
+"          -z# to set the compression when building\n"
 "\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"
 msgstr ""
 
-#: dpkg-deb/main.c:78
+#: dpkg-deb/main.c:79
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -3191,7 +3232,7 @@ msgid "part %d is missing"
 msgstr ""
 
 #: split/main.c:38
-msgid "Debian Linux `dpkg-split' package split/join tool; version "
+msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 
 #: split/main.c:40
@@ -3497,35 +3538,35 @@ msgstr ""
 msgid "failed to allocate colour pairs"
 msgstr ""
 
-#: dselect/baselist.cc:147
+#: dselect/baselist.cc:149
 msgid "failed to create title window"
 msgstr ""
 
-#: dselect/baselist.cc:151
+#: dselect/baselist.cc:153
 msgid "failed to create whatinfo window"
 msgstr ""
 
-#: dselect/baselist.cc:155
+#: dselect/baselist.cc:157
 msgid "failed to create baselist pad"
 msgstr ""
 
-#: dselect/baselist.cc:158
+#: dselect/baselist.cc:160
 msgid "failed to create heading pad"
 msgstr ""
 
-#: dselect/baselist.cc:162
+#: dselect/baselist.cc:164
 msgid "failed to create thisstate pad"
 msgstr ""
 
-#: dselect/baselist.cc:166
+#: dselect/baselist.cc:168
 msgid "failed to create info pad"
 msgstr ""
 
-#: dselect/baselist.cc:170
+#: dselect/baselist.cc:172
 msgid "failed to create query window"
 msgstr ""
 
-#: dselect/baselist.cc:182
+#: dselect/baselist.cc:184
 #, c-format
 msgid ""
 "baselist::startdisplay() done ...\n"
@@ -3540,20 +3581,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/baselist.cc:238
+#: dselect/baselist.cc:240
 msgid "keybindings"
 msgstr ""
 
-#: dselect/baselist.cc:293
+#: dselect/baselist.cc:295
 msgid "  -- %d%%, press "
 msgstr ""
 
-#: dselect/baselist.cc:296
+#: dselect/baselist.cc:298
 #, c-format
 msgid "%s for more"
 msgstr ""
 
-#: dselect/baselist.cc:300
+#: dselect/baselist.cc:302
 #, c-format
 msgid "%s to go back"
 msgstr ""
@@ -3702,72 +3743,72 @@ msgstr ""
 msgid "Type dselect --help for help."
 msgstr ""
 
-#: dselect/main.cc:66
+#: dselect/main.cc:67
 msgid "access"
 msgstr ""
 
-#: dselect/main.cc:66
+#: dselect/main.cc:67
 msgid "Choose the access method to use."
 msgstr ""
 
-#: dselect/main.cc:67
+#: dselect/main.cc:68
 msgid "update"
 msgstr ""
 
-#: dselect/main.cc:67
+#: dselect/main.cc:68
 msgid "Update list of available packages, if possible."
 msgstr ""
 
-#: dselect/main.cc:68
+#: dselect/main.cc:69
 msgid "select"
 msgstr ""
 
-#: dselect/main.cc:68
+#: dselect/main.cc:69
 msgid "Request which packages you want on your system."
 msgstr ""
 
-#: dselect/main.cc:69 dselect/pkgdisplay.cc:39
+#: dselect/main.cc:70 dselect/pkgdisplay.cc:39
 msgid "install"
 msgstr ""
 
-#: dselect/main.cc:69
+#: dselect/main.cc:70
 msgid "Install and upgrade wanted packages."
 msgstr ""
 
-#: dselect/main.cc:70
+#: dselect/main.cc:71
 msgid "config"
 msgstr ""
 
-#: dselect/main.cc:70
+#: dselect/main.cc:71
 msgid "Configure any packages that are unconfigured."
 msgstr ""
 
-#: dselect/main.cc:71 dselect/pkgdisplay.cc:41
+#: dselect/main.cc:72 dselect/pkgdisplay.cc:41
 msgid "remove"
 msgstr ""
 
-#: dselect/main.cc:71
+#: dselect/main.cc:72
 msgid "Remove unwanted software."
 msgstr ""
 
-#: dselect/main.cc:72
+#: dselect/main.cc:73
 msgid "quit"
 msgstr ""
 
-#: dselect/main.cc:72
+#: dselect/main.cc:73
 msgid "Quit dselect."
 msgstr ""
 
-#: dselect/main.cc:73
+#: dselect/main.cc:74
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:78
+#: dselect/main.cc:79
 #, c-format
-msgid "Debian Linux `%s' package handling frontend."
+msgid "Debian GNU/Linux `%s' package handling frontend."
 msgstr ""
 
-#: dselect/main.cc:81
+#: dselect/main.cc:82
 #, c-format
 msgid ""
 "Version %s.  Copyright (C) 1994-1996 Ian Jackson.   This is\n"
@@ -3776,39 +3817,40 @@ msgid ""
 "details.\n"
 msgstr ""
 
-#: dselect/main.cc:93
+#: dselect/main.cc:94
 msgid ""
 "Usage: dselect [options]\n"
 "       dselect [options] action ...\n"
 "Options:  --admindir <directory>  (default is /var/lib/dpkg)\n"
-"          --help  --version  --licence   --debug <file> | -D<file> | -D\n"
+"          --help  --version  --licence  --expert  --debug <file> | -D<file> "
+"| -D\n"
 "Actions:  access update select install config remove quit menu\n"
 msgstr ""
 
-#: dselect/main.cc:139
+#: dselect/main.cc:140
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:165
+#: dselect/main.cc:171
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:167
+#: dselect/main.cc:173
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:168
+#: dselect/main.cc:174
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool "
 msgstr ""
 
-#: dselect/main.cc:170
+#: dselect/main.cc:176
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:244
+#: dselect/main.cc:252
 msgid ""
 "\n"
 "\n"
@@ -3817,11 +3859,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:262
+#: dselect/main.cc:271
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:333
+#: dselect/main.cc:342
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
@@ -3839,10 +3881,6 @@ msgstr ""
 msgid "Abbrev."
 msgstr ""
 
-#: dselect/methlist.cc:112 dselect/pkgtop.cc:296
-msgid "Description"
-msgstr ""
-
 #: dselect/methlist.cc:156
 msgid "doupdate failed"
 msgstr ""
@@ -3859,7 +3897,7 @@ msgstr ""
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:165 dselect/pkgdepcon.cc:239 dselect/pkgdepcon.cc:278
+#: dselect/methlist.cc:165 dselect/pkgdepcon.cc:242 dselect/pkgdepcon.cc:281
 msgid "[none]"
 msgstr ""
 
@@ -3973,7 +4011,7 @@ msgstr ""
 msgid "installation script"
 msgstr ""
 
-#: dselect/method.cc:264
+#: dselect/method.cc:266
 msgid "query/setup script"
 msgstr ""
 
@@ -4117,267 +4155,274 @@ msgstr ""
 msgid "purge"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:46
+#. WTA: the space is a trick to work aroung gettext which uses the empty
+#. * string to store information about the translation
+#.
+#: dselect/pkgdisplay.cc:47
+msgid " "
+msgstr ""
+
+#: dselect/pkgdisplay.cc:48
 msgid "REINSTALL"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:50
+#: dselect/pkgdisplay.cc:52
 msgid "unpacked (not set up)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc:53
 msgid "failed config"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc:55
 msgid "half installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc:56
 msgid "removed (configs remain)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc:59
 msgid "Required"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc:60
 msgid "Important"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:59
+#: dselect/pkgdisplay.cc:61
 msgid "Standard"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:60
+#: dselect/pkgdisplay.cc:62
 msgid "Recommended"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc:63
 msgid "Optional"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc:64
 msgid "Extra"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc:65
 msgid "Contrib"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc:66
 msgid "!Bug!"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc:67
 msgid "Unclassified"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:68
+#: dselect/pkgdisplay.cc:70
 msgid "suggests"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:69
+#: dselect/pkgdisplay.cc:71
 msgid "recommends"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc:72
 msgid "depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc:73
 msgid "pre-depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc:74
 msgid "conflicts with"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc:75
 msgid "provides"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc:76
 msgid "replaces"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc:77
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:80
 msgid "Req"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:79
+#: dselect/pkgdisplay.cc:81
 msgid "Imp"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:80
+#: dselect/pkgdisplay.cc:82
 msgid "Std"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:83
 msgid "Rec"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:84
 msgid "Opt"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:85
 msgid "Xtr"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:86
 msgid "Ctb"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:87
 msgid "bUG"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:88
 msgid "?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:94 dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:96 dselect/pkgdisplay.cc:116
 msgid "Broken"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:95
+#: dselect/pkgdisplay.cc:97
 msgid "New"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc:98
 msgid "Updated"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:97
+#: dselect/pkgdisplay.cc:99
 msgid "Obsolete/local"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:100
 msgid "Up-to-date"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:101
 msgid "Available"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:100 dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:118
 msgid "Removed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:112
 msgid "Brokenly installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:104
 msgid "Newly available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc:105
 msgid "Updated packages (newer version is available)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:104
+#: dselect/pkgdisplay.cc:106
 msgid "Obsolete and local packages present on system"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:107
 msgid "Up to date installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:108
 msgid "Available packages (not currently installed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:109
 msgid "Removed and no longer available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc:113
 msgid "Installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:112
+#: dselect/pkgdisplay.cc:114
 msgid "Removed packages (configuration still present)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:115
 msgid "Purged packages and those never installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:117
 msgid "Installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:119
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:195
+#: dselect/pkgdisplay.cc:197
 msgid "dselect - recursive package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:196
+#: dselect/pkgdisplay.cc:198
 msgid "dselect - inspection of package states"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - main package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:205
+#: dselect/pkgdisplay.cc:207
 msgid " (by section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc:210
 msgid " (avail., section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc:213
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:220
+#: dselect/pkgdisplay.cc:222
 msgid " (by priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc:225
 msgid " (avail., priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc:228
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:235 dselect/pkgdisplay.cc:247
+#: dselect/pkgdisplay.cc:237 dselect/pkgdisplay.cc:249
 msgid " (alphabetically)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc:240
 msgid " (by availability)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc:243
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:255
+#: dselect/pkgdisplay.cc:257
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:256
+#: dselect/pkgdisplay.cc:258
 msgid " mark:+/=/- verbose:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:257
+#: dselect/pkgdisplay.cc:259
 msgid " terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:260
 msgid " verbose:v help:?"
 msgstr ""
 
@@ -4498,3 +4543,270 @@ msgstr ""
 #: dselect/pkgtop.cc:287
 msgid "Package"
 msgstr ""
+
+#: dselect/helpmsgs.cc:8
+msgid "Keystrokes"
+msgstr ""
+
+#: dselect/helpmsgs.cc:8
+msgid ""
+"Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
+"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
+"  ^n                    ^p                      scroll list by 1 line\n"
+"  t, Home               e, End                  jump to top/end of list\n"
+"  u                     d                       scroll info by 1 page\n"
+"  ^u                    ^d                      scroll info by 1 line\n"
+"  B, Left-arrow         F, Right-arrow          pan display by 1/3 screen\n"
+"  ^b                    ^f                      pan display by 1 character\n"
+"\n"
+"Mark packages for later processing:\n"
+" +, Insert  install or upgrade      =, H  hold in present state\n"
+" -, Delete  remove                  :, G  unhold: upgrade or leave "
+"uninstalled\n"
+" _          remove & purge config\n"
+"                                             Miscellaneous:\n"
+"Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+"Help)\n"
+" Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+"displays\n"
+"   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+"options\n"
+" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+"opts\n"
+"   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"
+msgstr ""
+
+#: dselect/helpmsgs.cc:33
+msgid "Introduction to package list"
+msgstr ""
+
+#: dselect/helpmsgs.cc:33
+msgid ""
+"Welcome to the main package listing.  Please read the help that is available "
+"!\n"
+"\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
+"for installation.  You can navigate around the list using the cursor keys,\n"
+"mark packages for installation (using `+') or deinstallation (using `-').\n"
+"\n"
+"Packages can be marked either singly or in groups; initially you will see "
+"that\n"
+"the line `All packages' is selected.  `+', `-' and so on will affect all "
+"the\n"
+"packages described by the highlighted line.  Use `o' to change the order of "
+"the\n"
+"list (this also changes which kinds of group selections are possible).\n"
+"\n"
+"(Mainly for new installations:) Standard packages will be requested by "
+"default.\n"
+"Use capital `D' or `R' key to override this - see the keybindings help "
+"screen.\n"
+"\n"
+"Some of your choices will cause conflicts or dependency problems; you will "
+"be\n"
+"given a sub-list of the relevant packages, so that you can solve the "
+"problems.\n"
+"\n"
+"When you are satisfied with your choices you should press Return to confirm\n"
+"your changes and leave the package listing.  A final check on conflicts and\n"
+"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"
+msgstr ""
+
+#: dselect/helpmsgs.cc:58
+msgid "Introduction to package list browser (read-only)"
+msgstr ""
+
+#: dselect/helpmsgs.cc:58
+msgid ""
+"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"
+"\n"
+"Much on-line help is available, please make use of it !  Press `?' for "
+"help.\n"
+"You should read the list of keys and the explanations of the display.\n"
+"\n"
+"You will be presented with a list of packages which are installed or "
+"available\n"
+"for installation.  You can navigate around the list using the cursor keys "
+"(just\n"
+"as you would be able to do if you had read/write access - see the "
+"keystrokes\n"
+"help screen) and observe the status of the packages and read information "
+"about\n"
+"them.\n"
+"\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"
+msgstr ""
+
+#: dselect/helpmsgs.cc:75
+msgid "Introduction to conflict/dependency resolution sub-list"
+msgstr ""
+
+#: dselect/helpmsgs.cc:75
+msgid ""
+"Dependency/conflict resolution - introduction.\n"
+"\n"
+"One or more of your choices have raised a conflict or dependency problem -\n"
+"some packages should only be installed in conjunction with certain others, "
+"and\n"
+"some combinations of packages may not be installed together.\n"
+"\n"
+"You will see a sub-list containing the packages involved.  The bottom half "
+"of\n"
+"the display shows relevant conflicts and dependencies; use `i' to cycle "
+"between\n"
+"that, the package descriptions and the internal control information.\n"
+"\n"
+"A set of `suggested' packages has been calculated, and the initial markings "
+"in\n"
+"this sub-list have been set to match those, so you can just hit Return to\n"
+"accept the suggestions if you wish.  You may abort the change(s) which "
+"caused\n"
+"the problem(s), and go back to the main list, by pressing capital `X'.\n"
+"\n"
+"You can also move around the list and change the markings so that they are "
+"more\n"
+"like what you want, and you can `reject' my suggestions by using the "
+"capital\n"
+"`D' or `R' keys (see the keybindings help screen).  You can use capital `Q' "
+"to\n"
+"force me to accept the situation currently displayed, in case you want to\n"
+"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"
+msgstr ""
+
+#: dselect/helpmsgs.cc:100
+msgid "Display, part 1: package listing and status chars"
+msgstr ""
+
+#: dselect/helpmsgs.cc:100
+msgid ""
+"The top half of the screen shows a list of packages.  For each package you "
+"see\n"
+"four columns for its current status on the system and mark.  In terse mode "
+"(use\n"
+"`v' to toggle verbose display) these are single characters, from left to "
+"right:\n"
+"\n"
+" Error flag: Space - no error (but package may be in broken state - see "
+"below)\n"
+"              `R'  - serious error during installation, needs "
+"reinstallation;\n"
+" Installed state:   Space - not installed;\n"
+"                     `*'  - installed;\n"
+"                     `-'  - not installed but config files remain;\n"
+"       packages in { `U'  - unpacked but not yet configured;\n"
+"      these states { `C'  - half-configured (an error happened);\n"
+"        are broken { `I'  - half-installed (an error happened).\n"
+" Old mark: what was requested for this package before presenting this list;\n"
+" Mark: what is requested for this package:\n"
+"  `*': marked for installation or upgrade;\n"
+"  `-': marked for removal, but any configuration files will remain;\n"
+"  `=': on hold: package will not be processed at all;\n"
+"  `_': marked for purge completely - even remove configuration;\n"
+"  `n': package is new and has yet to be marked for install/remove/&c.\n"
+"\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"
+msgstr ""
+
+#: dselect/helpmsgs.cc:125
+msgid "Display, part 2: list highlight; information display"
+msgstr ""
+
+#: dselect/helpmsgs.cc:125
+msgid ""
+"* Highlight: One line in the package list will be highlighted.  It "
+"indicates\n"
+"  which package(s) will be affected by presses of `+', '-' and `_'.\n"
+"\n"
+"* The dividing line in the middle of the screen shows a brief explanation "
+"of\n"
+"  the status of the currently-highlighted package, or a description of "
+"which\n"
+"  group is highlighted if a group line is.  If you don't understand the\n"
+"  meaning of some of the status characters displayed, go to the relevant\n"
+"  package and look at this divider line, or use the `v' key for a verbose\n"
+"  display (press `v' again to go back to the terse display).\n"
+"\n"
+"* The bottom of the screen shows more information about the\n"
+"  currently-highlighted package (if there is only one).\n"
+"\n"
+"  It can show an extended description of the package, the internal package\n"
+"  control details (either for the installed or available version of the\n"
+"  package), or information about conflicts and dependencies involving the\n"
+"  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"
+msgstr ""
+
+#: dselect/helpmsgs.cc:148
+msgid "Introduction to method selection display"
+msgstr ""
+
+#: dselect/helpmsgs.cc:148
+msgid ""
+"dselect and dpkg can do automatic installation, loading the package files to "
+"be\n"
+"installed from one of a number of different possible places.\n"
+"\n"
+"This list allows you to select one of these installation methods.\n"
+"\n"
+"Move the highlight to the method you wish to use, and hit Enter.  You will "
+"then\n"
+"be prompted for the information required to do the installation.\n"
+"\n"
+"As you move the highlight a description of each method, where available, is\n"
+"displayed in the bottom half of the screen.\n"
+"\n"
+"If you wish to quit without changing anything use the `x' key while in the "
+"list\n"
+"of installation methods.\n"
+"\n"
+"A full list of keystrokes is available by pressing `k' now, or from the "
+"help\n"
+"menu reachable by pressing `?'.\n"
+msgstr ""
+
+#: dselect/helpmsgs.cc:167
+msgid "Keystrokes for method selection"
+msgstr ""
+
+#: dselect/helpmsgs.cc:167
+msgid ""
+"Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
+"  n, Down-arrow         p, Up-arrow             move highlight\n"
+"  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
+"  ^n                    ^p                      scroll list by 1 line\n"
+"  t, Home               e, End                  jump to top/end of list\n"
+"  u                     d                       scroll info by 1 page\n"
+"  ^u                    ^d                      scroll info by 1 line\n"
+"  B, Left-arrow         F, Right-arrow          pan display by 1/3 screen\n"
+"  ^b                    ^f                      pan display by 1 character\n"
+"(These are the same motion keys as in the package list display.)\n"
+"\n"
+"Quit:\n"
+" Return, Enter    select this method and go to its configuration dialogue\n"
+" x, X             exit without changing or setting up the installation "
+"method\n"
+"\n"
+"Miscellaneous:\n"
+"  ?, Help, F1      request help\n"
+" ^l                redraw display\n"
+"  /                search (just return to cancel)\n"
+"  \\                repeat last search\n"
+msgstr ""

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c73e8f0a2037495aa5be977bfcbef29bac184c40..db49dd263ff9376e547cd100beaea6fc17054337 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -7,14 +7,12 @@ include ../Makefile.conf
 BIN_SCRIPTS            = dpkg-name dpkg-source dpkg-genchanges \
                          dpkg-gencontrol dpkg-shlibdeps dpkg-buildpackage \
                          dpkg-parsechangelog dpkg-distaddfile 822-date \
-                         dpkg-scanpackages dpkg-scansources dpkg-architecture \
-                         dpkg-safefilelist
+                         dpkg-scanpackages dpkg-scansources dpkg-architecture
 
 SBIN_SCRIPTS           = update-rc.d update-alternatives install-info \
                          dpkg-divert cleanup-info
 
-MAN1PAGES              = dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \
-                         dpkg-safefilelist.1
+MAN1PAGES              = dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1
 MAN8PAGES              = update-rc.d.8 update-alternatives.8 install-info.8  \
                          cleanup-info.8 dpkg-scanpackages.8 dpkg-scansources.8 \
                          dpkg-divert.8

diff --git a/scripts/dpkg-safefilelist.1 b/scripts/dpkg-safefilelist.1
deleted file mode 100644 (file)
index 6c0621c..0000000
--- a/scripts/dpkg-safefilelist.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.\" This is an -*- nroff -*- source file.
-.\" dpkg-safefilelist and this manpage are Copyright 1999 by Adam Heath.
-.\"
-.\" This is free software; see the GNU General Public Licence version 2
-.\" or later for copying conditions.  There is NO warranty.
-.\" Time-stamp: <Fri, 24 Dec 1999 05:36:51 -0600>
-.TH dpkg-safefilelist 1 "December 1999" "Debian Project" "Debian GNU/Linux"
-.SH NAME
-dpkg\-safefilelist \- List files with symlinks after their targets
-.SH SYNOPSIS
-.B dpkg\-safefilelist
-.SH DESCRIPTION
-.PP
-This manual page documents the
-.B dpkg\-safefilelist
-.sh script which provides an easy way to list files with the targets
-coming before the symlinks that point to them.
-
-.SH EXAMPLES
-.TP
-.B dpkg-safefilelist
-This will find all files in the current directory, and sort them,
-printing symlinks after their targets.
-.SH BUGS?
-Successfully tested on
-.B Debian GNU/Linux 
-systems only.
-.SH SEE ALSO
-.BR dpkg-deb (8),
-.BR find (1),
-.SH COPYRIGHT
-Copyright 1999 Adam Heath.
-.B dpkg-safefilelist
-is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is
-.B no
-warranty.

diff --git a/scripts/dpkg-safefilelist.pl b/scripts/dpkg-safefilelist.pl
deleted file mode 100644 (file)
index 6521015..0000000
--- a/scripts/dpkg-safefilelist.pl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/perl
-open(FILES, "find -mindepth 1|");
-sub myprint {
-       print "@_\n";
-}
-while (<FILES>) {
-       chomp;
-       $file = $_;
-       if( ! -l $file ) {
-               print "$file\n" if(!$targets{$file});
-       }
-       $newfile = $file;
-       $oldfile = $newfile;
-
-       while (-l $newfile) {
-               push @symlinks, $newfile;
-               $oldfile = $newfile;
-               $link = readlink($newfile);
-               $newfile = $_;
-               $newfile =~ s,.*/,,;
-               $path = $_;
-               $path =~ s,[^/]*$,,;
-               $newfile = $path . $link;
-               break if("$oldfile" == "$newfile");
-       }
-       if(-e $newfile) {
-               push @symlinks, $newfile;
-               while($file = pop @symlinks) {
-                       if(!$targets{$file}) {
-                               $targets{$file} = 1;
-                               print "$file\n";
-                       }
-               }
-       }
-}

diff --git a/version-nr b/version-nr
index 9f05f9f2ce1c66b8e4327cd51e27c8c983a64293..ec70f75560773b1b4dc68dfd565d8308fb17bedc 100644 (file)
--- a/version-nr
+++ b/version-nr
@@ -1 +1 @@
-1.6.5
+1.6.6