Small fixups

diff --git a/ChangeLog b/ChangeLog
index 49d5bca179ac09abad7492b6bdb09b354ab6d4cf..ba8d5e863dfb0c8cac004598cbc7a65c4efa0168 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec  7 14:08:21 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Fix display of copyright in menu
+
 Tue Dec  7 01:26:21 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Commend changes made in pkgdepcon.cc; they're not completely

diff --git a/debian/changelog b/debian/changelog
index 178d2a231f666315953e0a8760aa754ce653b40e..2f7732e4df418484982372588992521228f6877a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,22 @@
+dpkg (1.6.3) unstable; urgency=high
+
+  * Comment dselect changes from 1.6.2, they seem to have a problem
+    Closes: #52043,52058,52088,51437
+  * Really fix emacs-stuff. Hopefully. Closes: #51919,51525
+  * Fix copyright display in dselect menu, Closes: #52093
+  * Fix uid/gid-changes in start-stop-daemon, Closes: #52081
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.6.2) unstable; urgency=low
 
   * New dpkg-scansources, Closes: #51888
   * Fix default for elispdir, Closes: #51919,51525
   * New manpages for cleanup-info and dpkg-divert, Closes: #51539, 46657
   * Buildsystem updates, Closes: #51525, 51855, 51914
+  * Modify dselect behaviour for suggests and recommends
 
- -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+ -- Wichert Akkerman <wakkerma@debian.org>  Sun,  5 Dec 1999 19:29:50 +0100
 
 dpkg (1.6.1) unstable; urgency=low
 

diff --git a/dselect/main.cc b/dselect/main.cc
index 632d1ba4bd6992dbbdad1ab4c1ed30e5581ad7c3..0d05e52c34ddaec878699594ddbd6229bb64e5dd 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -226,6 +226,7 @@ void dme(int i, int so) {
 }
 
 int refreshmenu(void) {
+  char buf[2048];
   curseson(); cbreak(); noecho(); nonl(); keypad(stdscr,TRUE);
 
   int y,x;
@@ -246,7 +247,8 @@ int refreshmenu(void) {
          "Press ENTER to confirm selection.   ^L to redraw screen.\n\n"));
 
   attrset(A_NORMAL);
-  addstr(gettext(copyrightstring));
+  sprintf(buf,gettext(copyrightstring),DPKG_VERSION_ARCH);
+  addstr(buf);
 
   return i;
 }

diff --git a/release.sh b/release.sh
index 96316c26e051dc3657586191d881dfddd4665caf..cca1559dd1b1c97192fd541e2d236a4b2883ead8 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -10,7 +10,7 @@ rm -rf `find . -name CVS -type d`
 rm -f `find . -name .cvsignore -type f`
 
 # Remove any cruft files...
-rm -f `find . -name '*.orig' -o -name '*.rej' -o -name '*~'`
+rm -f `find . -name '*.orig' -o -name '*.rej' -o -name '*~' -o name '.#*'`
 
 # Generate all the gettext stuff
 cd po