Bug#72634: marked as done (dselect help patches)
Your message dated Sun, 30 Jun 2002 14:20:45 -0400
with message-id <E17OjJV-0007h1-00@auric.debian.org>
and subject line Bug#72634: fixed in dpkg 1.10
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 28 Sep 2000 00:13:34 +0000
>From joy@cibalia.gkvk.hr Wed Sep 27 19:13:34 2000
Return-path: <joy@cibalia.gkvk.hr>
Received: from cibalia.gkvk.hr [::ffff:161.53.211.3]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 13eRKM-0000jH-00; Wed, 27 Sep 2000 19:13:31 -0500
Received: from joy by cibalia.gkvk.hr with local (Exim 3.12 #1 (Debian))
id 13eRMO-0006di-00
for <submit@bugs.debian.org>; Thu, 28 Sep 2000 02:15:36 +0200
Date: Thu, 28 Sep 2000 02:15:36 +0200
From: Josip Rodin <joy@cibalia.gkvk.hr>
To: submit@bugs.debian.org
Subject: dselect help patches
Message-ID: <20000928021536.A25496@cibalia.gkvk.hr>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="1yeeQ81UyVL57Vl7"
User-Agent: Mutt/1.0.1i
Delivered-To: submit@bugs.debian.org
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Package: dpkg
Severity: wishlist
Hi,
Here are some patches for dselect help screens and keybindings in them. The
spacebar key will mean next page, as in many other programs (most banal
examples are more or less :), enter key will mean enter selections, and q
key will exit help. The help screens are changed accordingly, plus a
rewording for clarity/readability or two; I also did s/gettext/_/ in a few
related spots.
--
Digital Electronic Being Intended for Assassination and Nullification
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=dif
Index: basecmds.cc
===================================================================
RCS file: /cvs/dpkg/dpkg/dselect/basecmds.cc,v
retrieving revision 1.10
diff -u -r1.10 basecmds.cc
--- basecmds.cc 2000/03/18 18:23:47 1.10
+++ basecmds.cc 2000/09/28 00:07:40
@@ -125,16 +125,14 @@
for (hme= helpmenu; hme->key && hme->key != key; hme++);
if (hme->key) {
attrset(list_attr);
- mvaddstr(1,0, gettext(hme->msg->text));
+ mvaddstr(1,0, _(hme->msg->text));
attrset(title_attr);
mvaddstr(0,0, _("Help: "));
- addstr(gettext(hme->msg->title));
+ addstr(_(hme->msg->title));
getyx(stdscr,y,x);
while (++x<maxx) addch(' ');
attrset(thisstate_attr);
- mvaddstr(maxy-1,0,
-_("? = help menu Space = exit help . = next help or a help page key ")
- );
+ mvaddstr(maxy-1,0, _("Press ? for help menu, <space> for next topic, <enter> to exit help."));
getyx(stdscr,y,x);
while (++x<maxx) addch(' ');
move(maxy,maxx);
@@ -146,21 +144,21 @@
attrset(A_BOLD);
mvaddch(i+3,3, hme->key);
attrset(A_NORMAL);
- mvaddstr(i+3,6, gettext(hme->msg->title));
+ mvaddstr(i+3,6, _(hme->msg->title));
}
mvaddstr(i+4,1,
- _("Press a key from the list above, Space to exit help,\n"
- " or `.' (full stop) to read each help page in turn. "));
+ _("Press a key from the list above, <enter>, `q' or `Q' to exit help,\n"
+ " or <space> to read each help page in turn. "));
nextkey= helpmenu[0].key;
}
refresh();
key= getch();
if (key == EOF) ohshite(_("error reading keyboard in help"));
- if (key == ' ') {
+ if (key == '\n' || key == '\r' || key == KEY_ENTER || key == 'q' || key == 'Q') {
break;
- } else if (key == '?') {
+ } else if (key == '?' || key == 'h') {
key= 0;
- } else if (key == '.') {
+ } else if (key == ' ' || key == '.') {
key= nextkey;
}
}
Index: helpmsgs.src
===================================================================
RCS file: /cvs/dpkg/dpkg/dselect/helpmsgs.src,v
retrieving revision 1.2
diff -u -r1.2 helpmsgs.src
--- helpmsgs.src 2000/01/09 15:35:30 1.2
+++ helpmsgs.src 2000/09/28 00:07:42
@@ -23,48 +23,48 @@
U set all to sUggested state / search (Return to cancel)
D set all to Directly requested state \\ repeat last search
-@@@ mainintro Introduction to package list
+@@@ mainintro Introduction to package selections
-Welcome to the main package listing. Please read the help that is available!
+Welcome to dselect's main package listing.
You will be presented with a list of packages which are installed or available
for installation. You can navigate around the list using the cursor keys,
mark packages for installation (using `+') or deinstallation (using `-').
-
Packages can be marked either singly or in groups; initially you will see that
the line `All packages' is selected. `+', `-' and so on will affect all the
-packages described by the highlighted line. Use `o' to change the order of the
-list (this also changes which kinds of group selections are possible).
-
-(Mainly for new installations:) Standard packages will be requested by default.
-Use capital `D' or `R' key to override this - see the keybindings help screen.
+packages described by the highlighted line.
Some of your choices will cause conflicts or dependency problems; you will be
given a sub-list of the relevant packages, so that you can solve the problems.
-When you are satisfied with your choices you should press Return to confirm
-your changes and leave the package listing. A final check on conflicts and
+You should read the list of keys and the explanations of the display.
+Much on-line help is available, please make use of it - press `?' at
+any time for help.
+
+When you have finished selecting packages, press <enter> to confirm changes,
+or `Q' to quit without saving changes. A final check on conflicts and
dependencies will be done - here too you may see a sublist.
-Press Space to leave help and enter the list; press `?' at any time for help.
+Press <enter> to leave help and enter the list now.
-@@@ readonlyintro Introduction to package list browser (read-only)
+@@@ readonlyintro Introduction to read-only package list browser
-Welcome to dselect's main package listing. Since you do not have the
-privilege necessary to update package states you are in read-only mode.
+Welcome to dselect's main package listing.
-Much on-line help is available, please make use of it! Press `?' for help.
-You should read the list of keys and the explanations of the display.
-
You will be presented with a list of packages which are installed or available
-for installation. You can navigate around the list using the cursor keys (just
-as you would be able to do if you had read/write access - see the keystrokes
-help screen) and observe the status of the packages and read information about
-them.
+for installation. Since you do not have the privilege necessary to update
+package states, you are in a read-only mode. You can navigate around the
+list using the cursor keys (please see the `Keystrokes' help screen), observe
+the status of the packages and read information about them.
+
+You should read the list of keys and the explanations of the display.
+Much on-line help is available, please make use of it - press `?' at
+any time for help.
-Press Space to leave help and enter the list; press `?' at any time for help.
When you have finished browsing, press `Q' or <enter> to quit.
+Press <enter> to leave help and enter the list now.
+
@@@ recurintro Introduction to conflict/dependency resolution sub-list
Dependency/conflict resolution - introduction.
@@ -88,7 +88,7 @@
force me to accept the situation currently displayed, in case you want to
override a recommendation or think that the program is mistaken.
-Press Space to leave help and enter the sub-list; remember: press `?' for help.
+Press <enter> to leave help and enter the sub-list; remember: press `?' for help.
@@@ displayexplain1 Display, part 1: package listing and status chars
--1yeeQ81UyVL57Vl7--
---------------------------------------
Received: (at 72634-close) by bugs.debian.org; 30 Jun 2002 18:37:10 +0000
>From rmurray@auric.debian.org Sun Jun 30 13:37:10 2002
Return-path: <rmurray@auric.debian.org>
Received: from auric.debian.org [206.246.226.45] (mail)
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 17OjZO-0003bP-00; Sun, 30 Jun 2002 13:37:10 -0500
Received: from rmurray by auric.debian.org with local (Exim 3.12 1 (Debian))
id 17OjJV-0007h1-00; Sun, 30 Jun 2002 14:20:45 -0400
From: Wichert Akkerman <wakkerma@debian.org>
To: 72634-close@bugs.debian.org
X-Katie: $Revision: 1.17 $
Subject: Bug#72634: fixed in dpkg 1.10
Message-Id: <E17OjJV-0007h1-00@auric.debian.org>
Sender: Ryan Murray <rmurray@auric.debian.org>
Date: Sun, 30 Jun 2002 14:20:45 -0400
Delivered-To: 72634-close@bugs.debian.org
We believe that the bug you reported is fixed in the latest version of
dpkg, which is due to be installed in the Debian FTP archive:
dpkg-dev_1.10_all.deb
to pool/main/d/dpkg/dpkg-dev_1.10_all.deb
dpkg-doc_1.10_all.deb
to pool/main/d/dpkg/dpkg-doc_1.10_all.deb
dpkg_1.10.dsc
to pool/main/d/dpkg/dpkg_1.10.dsc
dpkg_1.10.tar.gz
to pool/main/d/dpkg/dpkg_1.10.tar.gz
dpkg_1.10_i386.deb
to pool/main/d/dpkg/dpkg_1.10_i386.deb
dselect_1.10_i386.deb
to pool/main/d/dpkg/dselect_1.10_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 72634@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Wichert Akkerman <wakkerma@debian.org> (supplier of updated dpkg package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 21 Jun 2002 21:53:15 +0200
Source: dpkg
Binary: dpkg-static dselect dpkg-dev dpkg-doc dpkg
Architecture: source all i386
Version: 1.10
Distribution: unstable
Urgency: low
Maintainer: Dpkg Development <debian-dpkg@lists.debian.org>
Changed-By: Wichert Akkerman <wakkerma@debian.org>
Description:
dpkg - Package maintenance system for Debian
dpkg-dev - Package building tools for Debian
dpkg-doc - Dpkg Internals Documentation
dselect - a user tool to manage Debian packages
Closes: 2531 11228 34942 45787 58091 58653 66735 67174 72634 75947 76100 81009 83139 92650 93386 97239 98275 102367 103667 103839 103845 103994 104214 104230 104232 104561 105750 108887 109282 111503 112378 113120 114249 115783 117968 118420 119532 120924 121309 121489 122132 126340 127458 130130 130509 131439 131496 131758 132476 132632 132714 132901 133035 136349 138013 139159 140441 141906 143117 144121 146855 147872 147924
Changes:
dpkg (1.10) unstable; urgency=low
.
* dpkg now reorders symlinks when extracting debs. However, this is also
still done when building debs. After a stable release of Debian has
occurred with this modified dpkg, the reordering when building can be
removed.
* Fixed upper/lowercase problems with package names. Closes: Bug#58091
(and 3 others).
* Add Russian manual pages
* Fix n in dselect package list (performs searchagain now)
* Fix layout problem in dpkg-divert manpage. Closes: Bug#103667
* When a package is set to hold, and a reinstallation is requested,
-E will not properly skip it. Closes: #45787.
* Make dpkg-checkbuilddeps use dpkg-architecture. Closes: Bug#104230
* Improve dpkg-archtecture documentation. Closes: Bug#104232
* Update German translation. Closes: Bug#97239
* Update Polish translation. Closes: Bug#115783
* Update French translation.
* Update Brazilian translation.
* Update Danish translation.
* Update Galician translation.
* Update Portuguese translations.
* Add Catalan translation
* Add German md5sum manpage
* Add Brazilian update-alternatives manpage. Closes: Bug#122132
* Improve dselect manpage. Closes: Bug#103839
* dpkg-name(1) no longer mentions the non-existing dpkg(5) manpage.
Closes: Bug#104214
* Improve handling of Recommends and Suggests in dselect. Closes: Bug#34942
* Add per-user configuration files. Closes: Bug#103845
* Split dselect into its own package. dpkg Pre-Depends on it
to make sure no weird things happen during an upgrade but this
will allow us to make dselect option at some point in the future.
Closes: #114249.
* Make colours in dselect user-configurable. Closes: Bug#103994
* Make Q do an abort in the method selection menu to make things more
consistent with the package list
* Fix test for nice(2) failure in start-stop-daemon. Closes: Bug#104561
* Improve the dselect helpscreen a bit. Closes: Bug#72634
* New version comparison routine that can handle arbitrarily large numbers
and accepts `~' as a low-sorting character. Closes: Bug#93386
* dselect now accepts regular expressions when searching for packages
and can search in package descriptions as well.
Closes: Bug#81009,#83139
* Move query commands into a seperate dpkg-query command. For the old options
(-L,-l,-s,-S) dpkg will still call it for you.
* Add configurable package listing support to dpkg-query
* Handle window resize in dselect main menu. Closes: Bug#98275
* update-rc.d moved to the sysvinit package. Closes: Bug#108887,#109282
* Add --showformat and --show options to dpkg-deb and dpkg-query to
allow one to customize the output format
* several install-info cleanups:
* Move /usr/info/dir to /usr/share/info/dir. Closes: #67174.
* If /usr/share/info doesn't exist, print a message saying so,
instead of the confusing "couldn't lock" error. Closes: #2531.
* If /usr/share/info/dir doesn't exist, or is empty, try to copy the
backup from /var/backups/infodir.bak. Closes: #121309.
* Add a --remove-exactly option, and allow for relative filenames.
Closes: #92650.
* Use the section from the .info file if --section is not given.
Closes: #76100.
* Error messages now include the filename being processed.
Closes: #66735
* /usr/share/info/dir now has it's entries formatted to even widths.
Closes: #11228
* --calign|--align|--maxwidth are now ignored.
* strip enoent as well. Closes: Bug#112378
* Fix format error in Dutch translation. Closes: Bug#113120
* When parsing stdin, md5sum now displays '-' as the filename, to match
textutils md5sum. Closes: #121489.
* Apply patch from bug, to give update-alternatives a --list command.
Closes: #120924.
* Make dpkg-checkbuilddeps always check for build-essential.
Closes: Bug#118420.
* Use space seperated output instead of comma seperated in
dpkg-checkbuilddeps
* Update default ignore expression in dpkg-source to also match *~ and
*.swp in subdirs. Closes: Bug#127458
* Handle errors when verifying md5sums. Closes: Bug#102367
* dpkg-source now uses reliable timestamps for changed files.
Closes: Bug#105750
* Fix typo in start-stop-daemon help message. Closes: Bug#131439
* update-alternative exits with a non-zero exit code when displaying
a non-existing alternative. Closes: Bug#131496
* Use gzip -c in install-info. Closes: Bug#131758
* start-stop-daemon works on HP-UX now. Closes: Bug#130130
* Fix dselect spin when run without input. Closes: Bug#132476
* Update-alternatives now correctly restores an alternative to auto mode
when removing a manually selected alternative. Closes: Bug#132632
* Copy bugs and origin information into status file. Closes: Bug#132714
* Improve wording of update-alternatives --config text. Closes: Bug#133035
* Add manpages for dpkg.cfg and dselect.cfg. Closes: Bug#132901
* Improve test for illegal packagename for dpkg-gencontrol -p option
* Fix segfault when getenv("PATH") returns null. Closes: Bug#136349
* Add Large File Summit extensions. Closes: Bug#130509
* Fix typo in dpkg-source manpage. Closes: Bug#141906
* Re-fix handling of multiple blank lines in control. Closes: Bug#143117
* Document --force-confmiss and --force-bad-verify. Closes: Bug#146855
* Drop upgrade compat stuff in dpkg postinst for ancient versions (over
5 years old)
* Always set CLOEXEC on the lock fd. Closes: Bug#147872
* Clean up tmp files when ctrl-c is sent to dpkg-source. Closes:
Bug#58653.
* dpkg-source no longer requires exact case matches for fields in
debian/control. Closes: Bug#139159.
* dpkg-scanpackages now gives proper case for Source and Installed-Size.
Closes: Bug#119532.
* dpkg-architecture: s/build on/built on/; same for 'build for'.
Closes: Bug#140441.
* cl-debian.pl now recognizes emergency as valid in changelogs.
Closes: Bug#138013.
* Properly count recursive expansion of variables, instead of just
counting all variable expansions. Closes: #144121.
* Add -I<filename> to dpkg-buildpackage and dpkg-source, to excludes
files from tar, when building a native package. Closes: Bug#75947.
* Close the old debian/files file, before doing a rename. Closes:
Bug#111503.
* Fix documentation of -v<version> for dpkg-parsechangelog, removing the
requirement that the version has to be in the changelog. Closes:
Bug#117968.
* Fix typo in dpkg-source(1), s/-su/-sU/. Closes: Bug#126340.
* Add dpkg-scansources to dpkg-scanpackages(8). Closes: Bug#147924.
* Change /usr/info into a symlink to /usr/share/info if possible
Files:
df7d1380dde0d2b980421489e3ae8ea6 1354 base required dpkg_1.10.dsc
dce6fc650eb8343b03acacfac722b094 1623580 base required dpkg_1.10.tar.gz
cd1dbe55ff166971d591c9404e6905f6 1166408 base required dpkg_1.10_i386.deb
5c8a6950c9708044fe4d527e58b4ba18 80244 base required dselect_1.10_i386.deb
c8dab8d95d390d0d485e00db3c846c0f 1155281 byhand - dpkg-1.10_i386.nondebbin.tar.gz
f78567b6a153a00b24551fb1d9d24b9e 1321299 byhand - dpkg-1.10_i386-static.nondebbin.tar.gz
46e139f4860f978c4d9c9d0aee43f426 111386 utils standard dpkg-dev_1.10_all.deb
0fcdf112e49159b1128054603a895cd9 10718 doc optional dpkg-doc_1.10_all.deb
dce6fc650eb8343b03acacfac722b094 1623580 byhand - dpkg-1.10.tar.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
iQIXAwUBPROK7318BjbHbzjSFAK/fQf/TWJF2Op6OWrByhKH4ZphCrrwL5mXec3T
MnHN67jF4+afK/TnMxk+jiYXH+MbFOIHeXc8eHeeNF+todRVcaxc9DMco+Bm+Ef0
Mptw3yHbHvSgajctMKWkHPLYbnE40C8x3wqsnFPIkp5qV0PTviFiFtmdVdoKjGc2
vyFDzwKtSV+wnAs0uWVwGqrL0XQEedYHErY0UIEOODcANARzeGDP85Ih47HE003f
mUrFinWcPeZoD8ipAOFZUwPi0E+gyqd/U1Q+TkAUAdmE6P4aEj/10ZTtHQj9H7mq
lmegUYKfTZOG6/rjI5jVOSW/px9V7Qr91sHCp1GvdYsKEqF5DYKDYQf9EAHuFl19
eMGdjzTvnWRm72BPJ6CRpR4uZTsCjknSUepA4hgsxKJscxBYR/qxByK4esnNo3DG
F/M8EfIciNwiEHZ6jNhkPKoxPPo76qFeCqgkNV778eRkJsI8k6S0NCgAVuR5nFLR
gLA183WyT7MVhWCc9aFz9PZXFFe8goLJBHzUk6HbngsRNSSvkyqdKn0KDtIle/gB
Y6LF9UC7SO+e5xznjWHIkhyaAYNL/zZ7BCQS5ctoIf+ED7a2t3Wkjj9QBgtmmTGq
ZV5M0V3NfZrm1GEL6cyxeZIr5mTSLgQRH3ep+nmbzEQaSaOoayxW2zV5t5IB2I0s
YpT/mvlfIgwgcA==
=8IWo
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to debian-dpkg-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Reply to: