If all goes according to plan, the sarge freeze begins in 7 days. I know the release managers would like to get a tar-fixed version of dpkg in before then. In order to do that, we should probably consider uploading ASAP. The patch to do that, as well as the catch-up patch for 1.10.18.1, was mailed here last week and I think you've all probably seen it, and I think doogie's approved them. I'd also like to include the following minor fixes, patches against CVS v1_10 attached: #139781: dselect text UI doesn't seem to use >179 characters #235266: announces build-conflicts as unmet dependencies I'd suggest the following debian/changelog entry: dpkg (1.10.19) unstable; urgency=high * Distinguish unmet build dependencies from build conflicts. Closes: #217943, #235266. * Allow dselect to use the full window width. Closes: #139781. * Force NULL-termination of all tar file entry names. Closes: #232025. (high or medium in order to get the tar fix in pre-freeze). Can either of you approve these patches so we can get this done? Thanks, Scott -- Have you ever, ever felt like this? Had strange things happen? Are you going round the twist?
diff -ruNp cvs-dpkg-1.10~/ChangeLog cvs-dpkg-1.10/ChangeLog --- cvs-dpkg-1.10~/ChangeLog 2004-01-28 02:06:41.000000000 +0000 +++ cvs-dpkg-1.10/ChangeLog 2004-03-08 10:14:35.000000000 +0000 @@ -0,0 +1,6 @@ +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. + diff -ruNp cvs-dpkg-1.10~/dselect/methlist.cc cvs-dpkg-1.10/dselect/methlist.cc --- cvs-dpkg-1.10~/dselect/methlist.cc 2003-10-25 21:03:20.000000000 +0100 +++ cvs-dpkg-1.10/dselect/methlist.cc 2004-03-08 10:13:39.000000000 +0000 @@ -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 -ruNp cvs-dpkg-1.10~/dselect/pkgdisplay.cc cvs-dpkg-1.10/dselect/pkgdisplay.cc --- cvs-dpkg-1.10~/dselect/pkgdisplay.cc 2003-10-25 21:03:20.000000000 +0100 +++ cvs-dpkg-1.10/dselect/pkgdisplay.cc 2004-03-08 10:13:39.000000000 +0000 @@ -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; }
diff -ruNp cvs-dpkg-1.10~/ChangeLog cvs-dpkg-1.10/ChangeLog --- cvs-dpkg-1.10~/ChangeLog 2004-03-08 10:15:00.000000000 +0000 +++ cvs-dpkg-1.10/ChangeLog 2004-03-08 10:18:08.000000000 +0000 @@ -0,0 +1,6 @@ +Mon Mar 8 10:17:42 GMT 2004 Scott James Remnant <scott@netsplit.com> + + * scripts/dpkg-checkbuilddeps.pl: Push build-conflicts errors into + @conflicts instead of @unmet, this looks like an accidental error + introduced by bad copy&pasteing. + diff -ruNp cvs-dpkg-1.10~/scripts/dpkg-checkbuilddeps.pl cvs-dpkg-1.10/scripts/dpkg-checkbuilddeps.pl --- cvs-dpkg-1.10~/scripts/dpkg-checkbuilddeps.pl 2003-10-27 15:44:01.000000000 +0000 +++ cvs-dpkg-1.10/scripts/dpkg-checkbuilddeps.pl 2004-03-08 10:17:34.000000000 +0000 @@ -44,13 +44,13 @@ if (defined($fi{"C Build-Depends"})) { push @unmet, build_depends(parsedep($fi{"C Build-Depends"}, 1, 1), @status); } if (defined($fi{"C Build-Conflicts"})) { - push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1, 1), @status); + push @conflicts, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1, 1), @status); } if (! $binary_only && defined($fi{"C Build-Depends-Indep"})) { push @unmet, build_depends(parsedep($fi{"C Build-Depends-Indep"}, 1, 1), @status); } if (! $binary_only && defined($fi{"C Build-Conflicts-Indep"})) { - push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1, 1), @status); + push @conflicts, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1, 1), @status); } if (@unmet) {
Attachment:
signature.asc
Description: This is a digitally signed message part