From d240358e13aef925147156a6a9687195554a9376 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 28 May 1996 02:14:57 +0100 Subject: [PATCH] dpkg (1.2.3); priority=HIGH * install-info doesn't replicate section headings (Bug#3125, #2973). * New dpkg-name manpage broken off from script (oops!). * dselect help screens made consistent with new strings, flags, &c. * dselect error flag column labelled E (Error), not H (Hold). * `Escape' no longer bound to `exit list without saving' in dselect. -- Ian Jackson Tue, 28 May 1996 02:14:57 +0100 --- debian.Changelog | 10 ++++ debian.rules | 2 +- dselect/helpmsgs.src | 36 +++++++------- dselect/methkeys.cc | 1 - dselect/pkgdisplay.cc | 2 +- dselect/pkgkeys.cc | 1 - dselect/pkgtop.cc | 4 +- scripts/dpkg-name.1 | 58 ++++++++++++++++++---- scripts/dpkg-name.sh | 103 ---------------------------------------- scripts/install-info.pl | 3 +- version.h | 2 +- 11 files changed, 84 insertions(+), 138 deletions(-) diff --git a/debian.Changelog b/debian.Changelog index 744f0327..4d81e6da 100644 --- a/debian.Changelog +++ b/debian.Changelog @@ -1,3 +1,13 @@ +dpkg (1.2.3); priority=HIGH + + * install-info doesn't replicate section headings (Bug#3125, #2973). + * New dpkg-name manpage broken off from script (oops!). + * dselect help screens made consistent with new strings, flags, &c. + * dselect error flag column labelled E (Error), not H (Hold). + * `Escape' no longer bound to `exit list without saving' in dselect. + + -- Ian Jackson Tue, 28 May 1996 02:14:57 +0100 + dpkg (1.2.2); priority=MEDIUM * Fixed dselect coredump found by Erick Branderhorst (thanks). diff --git a/debian.rules b/debian.rules index acaf38b7..95a1efcd 100755 --- a/debian.rules +++ b/debian.rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f package=dpkg -version=1.2.2 +version=1.2.3 archi=$(shell dpkg --print-architecture) DIR:=$(shell pwd) diff --git a/dselect/helpmsgs.src b/dselect/helpmsgs.src index 3383d526..bff0a00f 100644 --- a/dselect/helpmsgs.src +++ b/dselect/helpmsgs.src @@ -96,24 +96,24 @@ The top half of the screen shows a list of packages. For each package you see four columns for its current status on the system and mark. In terse mode (use `v' to toggle verbose display) these are single characters, from left to right: - Hold/error flag: h - you have put the package on Hold - it won't be processed - R - serious error during installation, needs reinstallation; - X - serious error, needs reinstallation, package also on hold - Installed state: Space - not installed; - `*' - installed; - `-' - not installed but config files remain; - `u' - unpacked but not yet configured; - `C' - half-configured (an error happened); - `I' - half-installed (an error happened). + Error flag: Space - no error (but package may be in broken state - see below) + `R' - serious error during installation, needs reinstallation; + Installed state: Space - not installed; + `*' - installed; + `-' - not installed but config files remain; + packages in { `U' - unpacked but not yet configured; + these states { `C' - half-configured (an error happened); + are broken { `I' - half-installed (an error happened). Old mark: what was requested for this package before presenting this list; Mark: what is requested for this package: - `*': marked for installation; - `-': marked for removal, but configuration files will remain; + `*': marked for installation or upgrade; + `-': marked for removal, but any configuration files will remain; + `=': on hold: package will not be processed at all; `_': marked for purge completely - even remove configuration; - `n': package is new to this system (appears under `Old mark'). + `n': package is new and has yet to be marked for install/remove/&c. -Following those four columns are the Priority and Section of the package, -its name (possibly truncated to fit) and the summary description. +Also displayed are each package's Priority, Section, name, installed and +available version numbers (shift-V to display/hide) and summary description. @@@ displayexplain2 Display, part 2: list highlight; information display @@ -131,10 +131,12 @@ its name (possibly truncated to fit) and the summary description. currently-highlighted package (if there is only one). It can show an extended description of the package, the internal package - control details, or information about conflicts and dependencies involving - the current package (in conflict/dependency resolution sublists). + control details (either for the installed or available version of the + package), or information about conflicts and dependencies involving the + current package (in conflict/dependency resolution sublists). - Use the `i' key to cycle through the displays. + Use the `i' key to cycle through the displays, and `I' to hide the + information display or expand it to use almost all of the screen. @@@ methintro Introduction to method selection display diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc index c62947cb..cf3bca9a 100644 --- a/dselect/methkeys.cc +++ b/dselect/methkeys.cc @@ -109,7 +109,6 @@ const keybindings::orgbinding methodlist_korgbindings[]= { { KEY_ENTER, "select-and-quit" }, { '\r', "select-and-quit" }, - { 27, "abort" }, // esc { 'x', "abort" }, { 'X', "abort" }, diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc index b024f672..89d0ee53 100644 --- a/dselect/pkgdisplay.cc +++ b/dselect/pkgdisplay.cc @@ -48,7 +48,7 @@ const char *const priorityabbrevs[]= { "Req", "Imp", "Std", "Rec", "Opt", "Xtr", "Ctb", "bUG", "?" }; -const char statuschars[]= " UF*H-"; +const char statuschars[]= " UC*I-"; const char eflagchars[]= " R?#"; const char wantchars[]= "n*=-_"; diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc index 5070f031..198b040b 100644 --- a/dselect/pkgkeys.cc +++ b/dselect/pkgkeys.cc @@ -139,7 +139,6 @@ const keybindings::orgbinding packagelist_korgbindings[]= { { KEY_ENTER, "quitcheck" }, { '\r', "quitcheck" }, { 'Q', "quitnocheck" }, - { 27, "abortnocheck" }, // esc { 'x', "abortnocheck" }, { 'X', "abortnocheck" }, { 'R', "revert" }, diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc index 26c1492e..00d642fc 100644 --- a/dselect/pkgtop.cc +++ b/dselect/pkgtop.cc @@ -265,7 +265,7 @@ void packagelist::redrawcolheads() { for (int i=0; i .TH dpkg-name 1 "April 1996" "Debian Project" "Debian Linux" .SH NAME dpkg\-name \- rename Debian packages to full package names .SH SYNOPSIS -.B dpkg\-name [\-h|\-\-help] [\-v|\-\-version] [\-l|\-\-license] [--] [files] +.B dpkg\-name +[\-a|\-\-no\-architecture] [\-o|\-\-overwrite] [\-s|\-\-subdir [dir]] +[\-c|\-\-create\-dir] [\-h|\-\-help] [\-v|\-\-version] +[\-l|\-\-license] [\-[--] [files] .SH DESCRIPTION .PP This manual page documents the @@ -16,20 +20,56 @@ sh script which provides an easy way to rename .B Debian packages into their full package names. A full package name consists of -..deb as specified in the control -file of the package ( is --). +file of the package. The part of the filename will have +hyphens "-" replaced by underscores "_". The part of the +filename consists of the mainstream version information optionally +followed by a hyphen and the revision information. .SH EXAMPLES .TP -.B dpkg-name toedeledokie -The file `toedeledokie' will be renamed to emacs-19.29-4.i386.deb or +.B dpkg-name bar-foo.deb +The file `bar-foo.deb' will be renamed to bar_foo-1.0-2.i386.deb or something similar (depending on whatever information is in the control -part of `toedeledokie'). +part of `bar-foo.deb'). +.TP +.B find /root/debian/ \-name '*.deb' | xargs \-n 1 dpkg\-name -a +All files with the extension `deb' in the directory /root/debian and its +subdirectory's will be renamed by dpkg\-name if required into names with no +architecture information. +.TP +.B find -name '*.deb' | xargs \-n 1 dpkg-name -a -o -s -c +.B Don't do this. +Your archive will be messed up completely because a lot of packages +don't come with section information. +.B Don't do this. .TP -.B find /root/debian/ \-name '*.deb' | xargs dpkg\-name -All files with the extension `deb' in the directory /root/debian and -its subdirectory's will be renamed by dpkg\-name if required. +.B dpkg --build debian-tmp && dpkg-name -s .. debian-tmp.deb +This can be used when building new packages. .SS OPTIONS .TP +.B "\-a, \-\-no\-architecture" +The destination filename will not have the architecture information. +.TP +.B "\-o, \-\-overwrite" +Existing files will be overwritten if they have the same name as the +destination filename. +.TP +.B "\-s, \-\-subdir [dir]" +Files will be moved into subdir. If directory given as argument exists +the files will be moved into that direcotory otherswise the name of +the target directory is extracted from the section field in the +control part of the package. The target directory will be +`unstable/binary-/
'. If the section is +`non-free', `contrib' or no section information is found in the +control file the target directory is +`
/binary-'. The section field isn't required so +a lot of packages will find their way to the `no-section' area. Use +this option with care, it's messy. +.TP +.B "\-c, \-\-create\-dir" +This option can used together with the \-s option. If a target +directory isn't found it will be created automatically. +.B Use this option with care. +.TP .B "\-h, \-\-help" Print a usage message and exit successfully. .TP diff --git a/scripts/dpkg-name.sh b/scripts/dpkg-name.sh index 265f2ebe..1256802b 100644 --- a/scripts/dpkg-name.sh +++ b/scripts/dpkg-name.sh @@ -188,106 +188,3 @@ exit 0; # Local variables: # tab-width: 2 # End: - -dpkg-name.1: -.\" This is an -*- nroff -*- source file. -.\" dpkg-name and this manpage are Copyright 1995,1996 by Erick Branderhorst. -.\" -.\" This is free software; see the GNU General Public Licence version 2 -.\" or later for copying conditions. There is NO warranty. -.\" Time-stamp: <96/05/03 14:00:06 root> -.TH dpkg-name 1 "April 1996" "Debian Project" "Debian Linux" -.SH NAME -dpkg\-name \- rename Debian packages to full package names -.SH SYNOPSIS -.B dpkg\-name -[\-a|\-\-no\-architecture] [\-o|\-\-overwrite] [\-s|\-\-subdir [dir]] -[\-c|\-\-create\-dir] [\-h|\-\-help] [\-v|\-\-version] -[\-l|\-\-license] [\-[--] [files] -.SH DESCRIPTION -.PP -This manual page documents the -.B dpkg\-name -sh script which provides an easy way to rename -.B Debian -packages into their full package names. A full package name consists -of -..deb as specified in the control -file of the package. The part of the filename will have -hyphens "-" replaced by underscores "_". The part of the -filename consists of the mainstream version information optionally -followed by a hyphen and the revision information. -.SH EXAMPLES -.TP -.B dpkg-name bar-foo.deb -The file `bar-foo.deb' will be renamed to bar_foo-1.0-2.i386.deb or -something similar (depending on whatever information is in the control -part of `bar-foo.deb'). -.TP -.B find /root/debian/ \-name '*.deb' | xargs \-n 1 dpkg\-name -a -All files with the extension `deb' in the directory /root/debian and its -subdirectory's will be renamed by dpkg\-name if required into names with no -architecture information. -.TP -.B find -name '*.deb' | xargs \-n 1 dpkg-name -a -o -s -c -.B Don't do this. -Your archive will be messed up completely because a lot of packages -don't come with section information. -.B Don't do this. -.TP -.B dpkg --build debian-tmp && dpkg-name -s .. debian-tmp.deb -This can be used when building new packages. -.SS OPTIONS -.TP -.B "\-a, \-\-no\-architecture" -The destination filename will not have the architecture information. -.TP -.B "\-o, \-\-overwrite" -Existing files will be overwritten if they have the same name as the -destination filename. -.TP -.B "\-s, \-\-subdir [dir]" -Files will be moved into subdir. If directory given as argument exists -the files will be moved into that direcotory otherswise the name of -the target directory is extracted from the section field in the -control part of the package. The target directory will be -`unstable/binary-/
'. If the section is -`non-free', `contrib' or no section information is found in the -control file the target directory is -`
/binary-'. The section field isn't required so -a lot of packages will find their way to the `no-section' area. Use -this option with care, it's messy. -.TP -.B "\-c, \-\-create\-dir" -This option can used together with the \-s option. If a target -directory isn't found it will be created automatically. -.B Use this option with care. -.TP -.B "\-h, \-\-help" -Print a usage message and exit successfully. -.TP -.B "\-v, \-\-version" -Print version information and exit successfully. -.TP -.B "\-l, \-\-license" -Print copyright information and (a reference to GNU) license -information and exit successfully. -.SH BUGS? -Successfully tested on -.B Debian Linux -systems only. Some packages don't follow the name structure --..deb. Packages renamed by dpkg-name -will follow this structure. Generally this will have no impact on how -packages are installed by dselect/dpkg. -.SH SEE ALSO -.BR deb (5), -.BR deb-control (5), -.BR dpkg (5), -.BR dpkg (8), -.BR dpkg-deb (8). -.SH COPYRIGHT -Copyright 1995,1996 Erick Branderhorst. -.B dpkg-name -is free software; see the GNU General Public Licence version 2 or -later for copying conditions. There is -.B no -warranty. diff --git a/scripts/install-info.pl b/scripts/install-info.pl index 6ca15669..a50a3965 100755 --- a/scripts/install-info.pl +++ b/scripts/install-info.pl @@ -244,9 +244,8 @@ if (!$remove) { $mss= $i; @work= (@work[0..$i-1], @work[$j..$#work]); } elsif (length($sectionre)) { - for ($i=0; $i<=$#work && $work[$i] !~ m/^\* *menu/i; $i++) { } $mss= -1; - for (; $i<=$#work; $i++) { + for ($i=0; $i<=$#work; $i++) { $_= $work[$i]; next if m/^\*/; next unless m/$sectionre/io; diff --git a/version.h b/version.h index 3b9e8552..978d18e2 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define DPKG_VERSION "1.2.1" /* This line modified by Makefile */ +#define DPKG_VERSION "1.2.3" /* This line modified by Makefile */ -- 2.39.5