From: Christian Perrier Date: Thu, 2 Feb 2006 19:39:07 +0000 (+0000) Subject: Revert inadvertent changes to original man pages X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b2b1725f2a2e67c3d1bde8045b5d84e03795685;p=dpkg Revert inadvertent changes to original man pages --- diff --git a/man/C/deb-control.5 b/man/C/deb-control.5 index 508fcb1d..67e3a0c6 100644 --- a/man/C/deb-control.5 +++ b/man/C/deb-control.5 @@ -197,5 +197,5 @@ Description: GNU grep, egrep and fgrep. .\" .RE .SH SEE ALSO .BR deb (5), -.BR dpkg (8), +.BR dpkg (1), .BR dpkg-deb (1). diff --git a/man/C/dpkg-architecture.1 b/man/C/dpkg-architecture.1 index 03ff6061..6ccc99eb 100644 --- a/man/C/dpkg-architecture.1 +++ b/man/C/dpkg-architecture.1 @@ -1,4 +1,4 @@ -.TH DPKG-ARCHITECTURE 1 "2005-01-10" "Debian GNU/Linux" +.TH DPKG-ARCHITECTURE 1 "2006-01-23" "Debian GNU/Linux" .SH "NAME" dpkg\-architecture \- set and determine the architecture for package building .SH "SYNOPSIS" @@ -11,8 +11,8 @@ Valid options: \&\fB\-f\fR .PP Valid actions: -\&\fB\-l\fR, \fB\-q\fRVariable\-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command, -\fB\-L\fR +\&\fB\-l\fR, \fB\-e\fRDebian\-Architecture, \fB\-i\fRArchitecture\-Alias, +\fB\-q\fRVariable\-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command, \fB\-L\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" dpkg-architecture does provide a facility to determine and set the build and @@ -30,8 +30,12 @@ Indeed, it is often better to only specify one, because dpkg-architecture will warn you if your choice doesn't match the default. .PP The default action is \fB\-l\fR, which prints the environment variables, one each line, -in the format VARIABLE=value. If you are only interested in the value of a -single variable, you can use \fB\-q\fR. If you specify \fB\-s\fR, it will output an export +in the format VARIABLE=value. If you want to check for equality between two +Debian Architectures, you can use \fB\-e\fR, by default it will compare against +the currect Debian Architecture, being it the host. If you want to check for +identity of the current Debian Architecture against an Architecture Alias, you +can use \fB\-i\fR. If you are only interested in the value of a single variable, +you can use \fB\-q\fR. If you specify \fB\-s\fR, it will output an export command. This can be used to set the environment variables using eval. \fB\-u\fR does return a similar command to unset all variables. \fB\-c\fR does execute a command in an environment which has all variables set to the determined @@ -53,8 +57,13 @@ The machine the package is built on. The machine the package is built for. .IP "Debian Architecture" 4 .IX Item "Debian Architecture" -The Debian archietcture string, which specifies the binary tree in the \s-1FTP\s0 +The Debian architecture string, which specifies the binary tree in the \s-1FTP\s0 archive. Examples: i386, sparc, hurd\-i386. +.IP "Architecture Alias" 4 +.IX Item "Architecture Alias" +An architecture alias is a wildcard architecture that will match any real +architecture being part of it. The general form is \-. +Examples: linux\-any, linux\-alpha, any\-i386, hurd\-any. .IP "\s-1GNU\s0 System Type" 4 .IX Item "GNU System Type" An architecture specification string consisting of two parts, @@ -165,7 +174,7 @@ Debian architectures which don't equal a processor name. .SH "BACKWARD COMPATIBILITY" .IX Header "BACKWARD COMPATIBILITY" The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were only introduced -in relatively versions of \fIdpkg-architecture\fR (since dpkg 1.13.2), +in relatively recent versions of \fIdpkg-architecture\fR (since dpkg 1.13.2), before this \fIdebian/rules\fR files tended to check the values of the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject to change. @@ -197,7 +206,7 @@ endif And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS. .PP If you still wish to support versions of dpkg-dev that did not include -\fIdpkg-architetcure\fR, the following does the job: +\fIdpkg-architecture\fR, the following does the job: .IP .nf \&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture) diff --git a/man/C/dpkg-deb.1 b/man/C/dpkg-deb.1 index 6db9f21a..bb94c0af 100644 --- a/man/C/dpkg-deb.1 +++ b/man/C/dpkg-deb.1 @@ -19,14 +19,20 @@ dpkg\-deb - Debian package archive (.deb) manipulation tool .I archive .br .B dpkg\-deb +.BR \-W | \-\-show +.RB " [" \-\-showformat\fR=\fIformat "]" +.I archive +.br +.B dpkg\-deb .BR \-x | \-\-extract | \-X | \-\-vextract .I archive directory .br +.B dpkg\-deb +.BR \-e | \-\-control +.I archive directory +.br .B dpkg\-deb \-\-fsys\-tarfile .I archive -.br -.B dpkg\-deb \-\-control -.I archive directory .SH DESCRIPTION .B dpkg\-deb packs, unpacks and provides information about Debian archives. @@ -117,6 +123,20 @@ will print them in the order they were specified; if any of the components weren't present it will print an error message to stderr about each one and exit with status 2. .TP +.BR \-\-show ", " \-W +Provides information about a binary package archive in the format +specified by the +.B \-\-showformat +argument. + +This argument is a string that may reference any status field using the +"${\fIfield-name\fR}" form, a list of the valid fields can be easily +produced using +.B -I +on the same package. + +The default for this field is "${Package}\\t${Version}\\n". +.TP .BR \-\-field ", " \-f Extracts control file information from a binary package archive. @@ -236,8 +256,8 @@ package's scripts run and its status and contents recorded. .SH SEE ALSO .BR deb (5), .BR deb\-control (5), -.BR dpkg (8), -.BR dselect (8). +.BR dpkg (1), +.BR dselect (1). .SH AUTHOR .B dpkg\-deb and this manpage were written by Ian Jackson. They are diff --git a/man/C/dpkg-divert.8 b/man/C/dpkg-divert.8 index 6e3b82e0..f0384e01 100644 --- a/man/C/dpkg-divert.8 +++ b/man/C/dpkg-divert.8 @@ -103,7 +103,7 @@ important to dpkg, such as `status' or `available'. Note: dpkg\-divert preserves the old copy of this file, with extension "\-old", before replacing it with the new one. .SH SEE ALSO -.BR dpkg (8). +.BR dpkg (1). .SH AUTHOR Copyright (C) 1995 Ian Jackson. .sp diff --git a/man/C/dpkg-name.1 b/man/C/dpkg-name.1 index c6ffadc4..952c3c1b 100644 --- a/man/C/dpkg-name.1 +++ b/man/C/dpkg-name.1 @@ -90,7 +90,7 @@ might depend on this naming structure. .SH SEE ALSO .BR deb (5), .BR deb\-control (5), -.BR dpkg (8), +.BR dpkg (1), .BR dpkg\-deb (1), .BR find (1), .BR xargs (1). diff --git a/man/C/dpkg-query.1 b/man/C/dpkg-query.1 index f2143ffb..bd93743a 100644 --- a/man/C/dpkg-query.1 +++ b/man/C/dpkg-query.1 @@ -1,4 +1,4 @@ -.TH DPKG\-QUERY 1 "August 2001" "Debian Project" "dpkg suite" +.TH dpkg\-query 1 "2006-01-26" "Debian Project" "dpkg suite" .SH NAME dpkg\-query \- a tool to query the dpkg database @@ -18,17 +18,24 @@ is given, list all packages in \fI/var/lib/dpkg/status\fP. Normal shell wildchars are allowed in \fIpackage-name-pattern\fP. Please note you will probably have to quote \fIpackage-name-pattern\fP to prevent the shell from performing filename expansion. For example this will -list all package names starting with \*(lqlibc5\*(rq: +list all package names starting with \*(lqlibc6\*(rq: .T .nf - \fBdpkg\-query \-l 'libc5*'\fP + \fBdpkg\-query \-l 'libc6*'\fP .fi + +The output format of this option is not configurable, but varies +automatically to fit the terminal width. It is intended for human +readers, and is not easily machine-readable. See \fB\-W\fP (\fB\-\-show\fP) +and \fB\-\-showformat\fP for a way to configure the output format. .TP \fB\-W\fP | \fB\-\-show\fP \fIpackage-name-pattern\fP ... Just like the \fB\-\-list\fP option this will list all packages matching the given pattern. However the output can be customized using the \fB\-\-showformat\fP option. +The default output format gives one line per matching package, each line +having the name and installed version of the package, separated by a tab. .TP \fB\-s\fP | \fB\-\-status\fP \fIpackage-name\fP ... Report status of specified package. This just displays the entry in @@ -64,11 +71,60 @@ Change the location of the \fBdpkg\fR database. The default location is \fB-f\fP | \fB\-\-showformat=\fP\fIformat\fR This option is used to specify the format of the output \fB\-\-show\fP will produce. The format is a string that will be output for each package -listed. It can include the standard escape sequences \en (newline), \er -(carriage return) or \e\e (plain backslash). Package information can be -included by inserting variable references to package fields using the -${var[;width]} syntax. Fields are printed be right-aligned unless the -width is negative in which case left alignment will be used. +listed. + +In the format string, \(lq\fB\e\fP\(rq introduces escapes: + +.T +.nf + \fB\en\fP newline + \fB\er\fP carriage return + \fB\et\fP tab +.fi + +\(lq\fB\e\fP\(rq before any other character suppresses any special +meaning of the following character, which is useful for \(lq\fB\e\fP\(rq +and \(lq\fB$\fP\(rq. + +Package information can be included by inserting +variable references to package fields using the syntax +\(lq\fB${\fP\fIfield\fR[\fB;\fP\fIwidth\fR]\fB}\fP\(rq. Fields are +printed right-aligned unless the width is negative in which case left +alignment will be used. The following \fIfield\fRs are recognised: + +.T +.nf + \fBArchitecture\fP + \fBBugs\fP + \fBConffiles\fP + \fBConfig\-Version\fP + \fBConflicts\fP + \fBDepends\fP + \fBDescription\fP + \fBEnhances\fP + \fBEssential\fP + \fBFilename\fP + \fBInstalled\-Size\fP + \fBMD5sum\fP + \fBMSDOS\-Filename\fP + \fBMaintainer\fP + \fBOrigin\fP + \fBPackage\fP + \fBPre\-Depends\fP + \fBPriority\fP + \fBProvides\fP + \fBRecommends\fP + \fBReplaces\fP + \fBRevision\fP + \fBSection\fP + \fBSize\fP + \fBSource\fP + \fBStatus\fP + \fBSuggests\fP + \fBVersion\fP +.fi + +The default format string is \(lq\fB${Package}\et${Version}\en\fP\(rq. .SH ENVIRONMENT .TP @@ -87,5 +143,5 @@ later for copying conditions. There is NO warranty. .SH SEE ALSO -.BR dpkg (8) +.BR dpkg (1) diff --git a/man/C/dpkg-scanpackages.1 b/man/C/dpkg-scanpackages.1 index 5cc02832..91a1615c 100644 --- a/man/C/dpkg-scanpackages.1 +++ b/man/C/dpkg-scanpackages.1 @@ -21,6 +21,7 @@ dpkg\-scanpackages - create Packages files .B dpkg\-scanpackages .RI [ \-u ] .RI [ \-a ] +.RI [ \-m ] .I binarydir .I overridefile .RI [ pathprefix ] @@ -31,7 +32,7 @@ dpkg\-scanpackages - create Packages files .B dpkg\-scanpackages sorts through a tree of Debian binary packages and creates a Packages file, used by -.BR dselect (8), +.BR dselect (1), etc, to tell the user what packages are available for installation. These Packages files are the same as those found on Debian archive sites and CD-ROMs. You might use @@ -59,6 +60,12 @@ is specified, then scan for *.udeb, instead of *.deb. .PP When \-a\fI\fP is specified, then instead of scanning for all debs, a pattern consisting of *_all.deb and *_arch.deb is used. +.PP +If more than one version of a package is found only the newest one +is included in the output. If they have the same version and only +differ in architecture only the first one found is used. You can override +this behaviour with the \fI\-m\fP switch. If given, all found packages +are included in the output. . .SH THE OVERRIDE FILE While most information about a package can be found in the control file, @@ -112,6 +119,6 @@ field in their control file, are missing from the override file, or have maintainer substitutions which do not take effect. . .SH SEE ALSO -.BR dpkg (8), -.BR dselect (8), +.BR dpkg (1), +.BR dselect (1), .BR dpkg\-scansources (1). diff --git a/man/C/dpkg-scansources.1 b/man/C/dpkg-scansources.1 index 0e9729d9..1f4921f2 100644 --- a/man/C/dpkg-scansources.1 +++ b/man/C/dpkg-scansources.1 @@ -39,7 +39,7 @@ name. .IX Item "-s, --source-override file" Use \fIfile\fR as the source override file. The default is the name of the override file you specified with \fI.src\fR appended. -.sp +.Sp The source override file is in a different format from the binary override file. It contains only two whitespace separated fields, the first is the source package name and the second is the section. Blank lines and comment diff --git a/man/C/dpkg-source.1 b/man/C/dpkg-source.1 index 6c6d1742..a4110421 100644 --- a/man/C/dpkg-source.1 +++ b/man/C/dpkg-source.1 @@ -419,6 +419,11 @@ unpacks the original source tree. ensures that the original source is neither copied to the current directory nor unpacked. Any original source tree that was in the current directory is still removed. +.PP +All the +.B \-sX +options are mutually exclusive. If you specify more than one only the +last one will be used. .SH dpkg\-GENCONTROL OPTIONS .B dpkg\-gencontrol does not take any non-option arguments. @@ -516,7 +521,7 @@ are removed from the the substitution variables file. .TP .BI \-L localshlibsfile Causes -.B dpkg\-shlibs +.B dpkg\-shlibdeps to read overriding shared library dependency information from .I localshlibsfile instead of @@ -527,6 +532,15 @@ Causes the substitution variable settings to be printed to standard output, rather than being added to the substitution variables file .RB ( debian/substvars by default). +.TP +.BI \-t type +Causes +.B dpkg\-shlibdeps +to prefer shared library dependency information tagged for the given +package type. If no tagged information is available, falls back to untagged +information. The default package type is "deb". Shared library dependency +information is tagged for a given type by prefixing it with the name of the +type, a colon, and whitespace. .SH dpkg\-GENCHANGES OPTIONS .B dpkg\-genchanges does not take any non-option arguments. @@ -621,11 +635,11 @@ Specify the Debian architecture we build for. The architecture of the machine we build on is determined automatically, and is also the default for the host machine. .TP -.B \-i [] +.B \-i[] Passed unchanged to .BR dpkg\-source . .TP -.B \-I +.B \-I Passed unchanged to .BR dpkg\-source . May be repeated multiple times. @@ -806,8 +820,8 @@ and initial arguments for .IR gain-root-command " and " sign-command . .SH SEE ALSO .BR dpkg\-deb (1), -.BR dpkg (8), -.BR dselect (8), +.BR dpkg (1), +.BR dselect (1), .BR gpg (1), .BR pgp (1). .SH AUTHOR diff --git a/man/C/dpkg-split.1 b/man/C/dpkg-split.1 index ad7aba75..490a0678 100644 --- a/man/C/dpkg-split.1 +++ b/man/C/dpkg-split.1 @@ -246,7 +246,7 @@ filename format should not be relied upon. .BR deb (5), .BR deb\-control (5), .BR dpkg\-deb (1), -.BR dpkg (8) +.BR dpkg (1) .SH AUTHOR .B dpkg\-split and this manpage were written by Ian Jackson. They are diff --git a/man/C/dpkg-statoverride.8 b/man/C/dpkg-statoverride.8 index 386eab56..d34fceb8 100644 --- a/man/C/dpkg-statoverride.8 +++ b/man/C/dpkg-statoverride.8 @@ -1,4 +1,4 @@ -.TH DPKG-STATOVERRIDE 8 "November 2000" "Debian project" "dpkg utililties" +.TH DPKG-STATOVERRIDE 8 "2006-01-26" "Debian project" "dpkg utililties" .SH NAME dpkg\-statoverride - override ownership and mode of files .SH SYNOPSIS @@ -31,7 +31,7 @@ If \-\-update is specified and \fB\fR exists, it is immediately set to the new owner and mode. .TP .I \-\-remove -Remove an override for \fB\fR, the status of \fB\fR, the status of \fB\fR is left unchanged by this command. .TP .I \-\-list [] @@ -66,7 +66,7 @@ important to dpkg, such as `status' or `available'. Note: dpkg\-statoverride preserves the old copy of this file, with extension "-old", before replacing it with the new one. .SH SEE ALSO -.BR dpkg (8) +.BR dpkg (1) .SH AUTHOR Copyright 2000 Wichert Akkerman .UR mailto:wakkerma@debian.org diff --git a/man/C/dpkg.1 b/man/C/dpkg.1 index 64fbb7ca..cc946a0c 100644 --- a/man/C/dpkg.1 +++ b/man/C/dpkg.1 @@ -1,4 +1,4 @@ -.TH DPKG 1 "April 12, 1998" "Debian Project" "dpkg suite" +.TH DPKG 1 "2006-01-26" "Debian Project" "dpkg suite" .SH NAME dpkg - package manager for Debian @@ -19,7 +19,7 @@ packages are particularly inadequate. .SH DESCRIPTION \fBdpkg\fP is a tool to install, build, remove and manage Debian packages. The primary and more user-friendly -front-end for \fBdpkg\fP is \fBdselect\fP(8). \fBdpkg\fP itself is +front-end for \fBdpkg\fP is \fBdselect\fP(1). \fBdpkg\fP itself is controlled entirely via command line parameters, which consist of exactly one action and zero or more options. The action-parameter tells dpkg what to do and options control the behavior of the action in some way. @@ -486,6 +486,9 @@ multiple times. Log messages are of the form `YYYY-MM-DD HH:MM:SS status upgrade, remove, purge; and `YYYY-MM-DD HH:MM:SS conffile ' for conffile changes where \fI