debian/dpkg-doc.postrm: Use doc-name instead of file-name

dselect/pkgdisplay.cc: Replace empty string for eflags to a space so gettext doesn't use the translation-info
po/update.sh: Generate dselect/helpmsgs.{cc,h} so we can translate them.
po/POTFILES.in: add dselect/helpmsgs.cc
dselect/pkgtop.cc: use ACS_HLINE instead of `-'
dselect/baselist.cc: change colour of column headings
dselect: add a new --export mode which suppresses the display of the helpscreen

diff --git a/ChangeLog b/ChangeLog
index 5aae39804b14e25f922ca2a8af54dbc8fd15d935..d5cbee61046a9934086bac4f03711b984e7dab12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Wed Dec 22 12:07:40 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * debian/dpkg-doc.postrm: Use doc-name instead of file-name (probably
+    need to change the filename, but I'll be lazy now :)
+  * dselect/pkgdisplay.cc: Replace empty string for eflags to a space
+    so gettext doesn't use the translation-info
+  * po/update.sh: Generate dselect/helpmsgs.{cc,h} so we can translate them.
+  * po/POTFILES.in: add dselect/helpmsgs.cc
+  * dselect/Makefile.in: put helpmsgs.{cc,h} in $(srcdir), since gettext
+    will barf on us if we put them in the builddir. (The real issue here is
+    that when we generate the .po-files we don't know what the builddir will
+    be and gettext can't handle VPATH).
+  * dselect patches from Dan Gohman <gohmandj@mrs.umn.edu>:
+    + dselect/pkgtop.cc: use ACS_HLINE instead of `-'
+    + dselect/baselist.cc: change colour of column headings
+    + dselect: add a new --export mode which suppresses the display of the
+      helpscreen
+
 Tue Dec 21 15:59:35 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-scansoures.pl: don't use \z since that is perl5.005-specific.

diff --git a/debian/changelog b/debian/changelog
index e395a8695399a61b33cc847b4dbae94d9362aa76..47829816d7fcc04dc91e6ecc57949f3dc6f8ad36 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 dpkg (1.6.5) unstable; urgency=low
 
   * Don't use \z in dpkg-scansources, Closes: Bug# 53182
+  * Correctly unregister internals manual, Closes: Bug# 53200
+  * dselect helpessages can be translated now, Closes: Bug# 51381
+  * dselect UI tweaks, including a new --expert mode
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/debian/dpkg-doc.prerm b/debian/dpkg-doc.prerm
index b967c90d4309c8090668388fb94713d3afe5565b..fe9bbdded200310a3ed9a6a862c34ce357677aa7 100755 (executable)
--- a/debian/dpkg-doc.prerm
+++ b/debian/dpkg-doc.prerm
@@ -12,7 +12,7 @@ case "$1" in
     remove|deconfigure|upgrade)
        if command -v install-docs >/dev/null 2>&1; then
            echo -n "Unregistering DPKG documentation..."
-           install-docs -r dpkg-doc || true
+           install-docs -r dpkg-internals || true
            echo "done."
        fi
        ;;

diff --git a/dselect/.cvsignore b/dselect/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..8773694e4a6ea65809cc13b12980ec9ba54c4ece 100644 (file)
--- a/dselect/.cvsignore
+++ b/dselect/.cvsignore
@@ -1 +1,4 @@
 Makefile.in
+helpmsgs.cc
+helpmsgs.h
+curkeys.h

diff --git a/dselect/Makefile.in b/dselect/Makefile.in
index c83c4550bc4bbd3c43f73db508dbb4d25eade819..6f656198fe49cb3dfb82cb177b1bfc07a766af14 100644 (file)
--- a/dselect/Makefile.in
+++ b/dselect/Makefile.in
@@ -12,7 +12,8 @@ CXX_SOURCES   = basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
 MAN8PAGES      = dselect.8
 
 OBJECTS                = $(patsubst %.cc, %.o, $(CXX_SOURCES))
-GENFILES       = $(OBJECTS) dselect helpmsgs.h
+GENFILES       = $(OBJECTS) dselect helpmsgs.h curkeys.h \
+                 $(srcdir)/helpmsgs.h $(srcdir)/helpmsgs.cc
 
 .PHONY: all
 all:: dselect
@@ -50,8 +51,8 @@ dselect: $(OBJECTS) ../lib/libdpkg.a
 basecmds.o: helpmsgs.h
 curkeys.o: curkeys.h
 
-helpmsgs.h helpmsgs.cc: helpmsgs.src $(srcdir)/mkhelpmsgs.pl
-       perl $(srcdir)/mkhelpmsgs.pl $<
+$(srcdir)/helpmsgs.h $(srcdir)/helpmsgs.cc: helpmsgs.src $(srcdir)/mkhelpmsgs.pl
+       cd $(srcdir) ; perl $(srcdir)/mkhelpmsgs.pl $<
 
 curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
        cursesfile=`echo '#include <curses.h>' | \

diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index 5e208ae355ba2d53d60f7644f67acaa7ecdb7e3a..b4d13a170a02d1a5ea78ee36d63f4d3a8f7ab862 100644 (file)
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -121,6 +121,7 @@ void baselist::startdisplay() {
     thisstate_attr= COLOR_PAIR(3);
     selstate_attr= list_attr|A_BOLD;
     selstatesel_attr= listsel_attr|A_BOLD;
+    colheads_attr= COLOR_PAIR(3);
   } else {
     title_attr= A_REVERSE;
     thisstate_attr= A_STANDOUT;
@@ -128,10 +129,11 @@ void baselist::startdisplay() {
     listsel_attr= A_STANDOUT;
     selstate_attr= A_BOLD;
     selstatesel_attr= A_STANDOUT;
+    colheads_attr= A_BOLD;
   }
   query_attr= title_attr;
   info_attr= list_attr;
-  colheads_attr= info_headattr= A_BOLD;
+  info_headattr= A_BOLD;
   whatinfo_attr= thisstate_attr;
 
   // set up windows and pads, based on screen size

diff --git a/dselect/dselect.h b/dselect/dselect.h
index f82427275f71d43a4c6769dac3f54ee95112b180..838d167ebc51124b45abb7624de5f6102987ac59 100644 (file)
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -149,6 +149,7 @@ void cursesoff();
 
 extern const char *admindir;
 extern FILE *debug;
+extern int expertmode;
 
 enum urqresult { urqr_normal, urqr_fail, urqr_quitmenu };
 enum quitaction { qa_noquit, qa_quitchecksave, qa_quitnochecksave };

diff --git a/dselect/main.cc b/dselect/main.cc
index 2ab579c1b5b1295e65573614201374e86ff1bba8..a1637ef2028668b61df353e7bf3b26b8fecdbd4d 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -53,6 +53,7 @@ const char printforhelp[]= N_("Type dselect --help for help.");
 modstatdb_rw readwrite;
 const char *admindir= ADMINDIR;
 FILE *debug;
+int expertmode = 0;
 
 static keybindings packagelistbindings(packagelist_kinterps,packagelist_korgbindings);
 
@@ -93,7 +94,7 @@ static void usage(void) {
      _("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"),
        stdout)) werr("stdout");
 }
@@ -140,11 +141,16 @@ extern "C" {
     setvbuf(debug,0,_IONBF,0);
   }
 
+  static void setexpert() {
+    expertmode = 1;
+  }
+
 } /* End of extern "C" */
 
 static const struct cmdinfo cmdinfos[]= {
   { "admindir",   0,   1,  0,  &admindir,  0                      },
   { "debug",     'D',  1,  0,  0,          setdebug               },
+  { "expert",    'E',  0,  0,  0,          setexpert              },
   { "help",      'h',  0,  0,  0,          helponly               },
   { "version",    0,   0,  0,  0,          versiononly            },
   { "licence",    0,   0,  0,  0,          showcopyright          }, /* UK spelling */

diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 8de5332b15d8fd1b01a079e8acb36334ca345645..18fe4757733036237dd3fab46b1e3904e8b9fa9b 100644 (file)
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -41,8 +41,10 @@ const char
                            N_("remove"), 
                            N_("purge"),
                            0 },
-
-  *const eflagstrings[]=   { N_(""), 
+/* WTA: the space is a trick to work aroung gettext which uses the empty
+ * string to store information about the translation
+ */
+  *const eflagstrings[]=   { N_(" "), 
                             N_("REINSTALL"), 
                             0 },
 

diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index c429983cd015c35ce2fe12d823c719e8f4c49d19..ac493a6cfa3cf2e5491629d72facfe827adcc4c1 100644 (file)
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -491,6 +491,8 @@ pkginfo **packagelist::display() {
 
   setupsigwinch();
   startdisplay();
+
+  if (!expertmode)
   displayhelp(helpmenulist(),'i');
 
   if (debug) fprintf(debug,"packagelist[%p]::display() entering loop\n",this);

diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index e984b3097822141cb131e0295c6d13a18b4ed70a..1b5420ac412ce12006b588d04a590567c3f7ccd2 100644 (file)
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -235,9 +235,9 @@ void packagelist::redraw1itemsel(int index, int selected) {
     indent= describemany(buf,priority,section,pkg->clientdata);
 
     mvwaddstr(listpad,index,0, "    ");
-    i= total_width-6;
+    i= total_width-7;
     j= (indent<<1) + 1;
-    while (j-- >0) { waddch(listpad,'-'); i--; }
+    while (j-- >0) { waddch(listpad,ACS_HLINE); i--; }
     waddch(listpad,' ');
 
     wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
@@ -247,7 +247,7 @@ void packagelist::redraw1itemsel(int index, int selected) {
 
     waddch(listpad,' ');
     j= (indent<<1) + 1;
-    while (j-- >0) { waddch(listpad,'-'); i--; }
+    while (j-- >0) { waddch(listpad,ACS_HLINE); i--; }
 
     delete[] buf;
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8f7b3257d213c3e6851bfdc59fb16ff80cdcdbab..996ff8163ff3eb19d81de6dcea05ad528e23439f 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -57,3 +57,4 @@ dselect/pkglist.cc
 dselect/pkgsublist.cc
 dselect/pkgtop.cc
 
+dselect/helpmsgs.cc

diff --git a/po/update.sh b/po/update.sh
index 406edcd80065082a3f6ea040da22a725a767219b..441fa811f6e3d30f58a39fa6a488b0ff006b7c95 100755 (executable)
--- a/po/update.sh
+++ b/po/update.sh
@@ -1,10 +1,17 @@
 #!/bin/sh
 
+# We need to generate helpmsgs.cc so we can translate the
+# strings in it
+
+( cd ../dselect ;  perl mkhelpmsgs.pl helpmsgs.src )
+
 xgettext --default-domain=dpkg --directory=.. \
         --add-comments --keyword=_ --keyword=N_ \
         --files-from=POTFILES.in && test ! -f dpkg.po \
         || ( rm -f dpkg.pot && mv dpkg.po dpkg.pot )
 
+# Moving along..
+
 catalogs=`ls *.po`
 for cat in $catalogs; do
   if [ "$cat" = "dpkg.po" ] ; then continue ; fi