Apply patch from Colin Watson to fix #139781; dselect had a

hard-coded maximum window width of 179 chars for some things,
when COLS is easily available.

diff --git a/ChangeLog b/ChangeLog
index 5035f1af63a09640c3b3771d84420d601d81d61a..93e4c41ba4141c16323503773da0b8f4dcf992ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar  8 10:14:27 GMT 2004 Colin Watson <cjwatson@debian.org>
+ 
+  * dselect/methlist.cc, dselect/pkgdisplay.cc: Set the total display width
+  to the maximum of TOTAL_LIST_WIDTH and COLS, improving display on wide
+  terminals.
+
 Thu Mar  4 13:28:11 GMT 2004 Scott James Remnant <scott@netsplit.com>
 
   * lib/tarfn.c: Copy the Name and LinkName elements and ensure they

diff --git a/debian/changelog b/debian/changelog
index 9a1c4ae11f52d8af469e3ec6432b8a4fbb161865..ab9226286da7049b1ced08eadd22e60fdfa13788 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dpkg (1.10.19) unstable; urgency=low
   * Distinguish unmet build dependencies from build conflicts.
     Closes: #217943, #235266.
   * Force NULL-termination of all tar file entry names.  Closes: #232025.
+  * Allow dselect to use the full window width.  Closes: #139781.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 

diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 7761c49af62a11b935a289100e8b27370eb6998d..054e590d0cb21f6d35e2380e672ed7d703a22ba7 100644 (file)
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -67,6 +67,8 @@ void methodlist::setwidths() {
   description_column= name_column + name_width + gap_width;
 
   total_width= TOTAL_LIST_WIDTH;
+  if (total_width < COLS)
+    total_width= COLS;
   description_width= total_width - description_column;
 }
 

diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 2fc178092c8ee2e5eb95dd225af6ed78ba4ed7d5..a1f99b6901955e7538963748ee1aa294719fda87 100644 (file)
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -186,6 +186,8 @@ void packagelist::setwidths() {
   }
     
   total_width= TOTAL_LIST_WIDTH;
+  if (total_width < COLS)
+    total_width= COLS;
   description_width= total_width - description_column;
 }