The following commit has been merged in the master branch:
commit b07036b2b0bb4a6be8c9216195963856fe64b5ef
Author: Guillem Jover <[email protected]>
Date: Wed Mar 27 16:47:12 2013 +0100
man: Place ENVIRONMENT and FILES sections contiguously
diff --git a/debian/changelog b/debian/changelog
index f098494..d04207b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
- Move dangers of installing via dpkg-deb from BUGS to a NOTES section.
- Remove BUGS sections containing obvious or misplaced information.
- Move BUGS sections before EXAMPLES and SEE ALSO sections.
+ - Place ENVIRONMENT and FILES sections contiguously.
* Use colon instead of dot for user:group in dpkg debug output.
* Remove support for obsolete DM-Upload-Allowed from Dpkg::Vendor::Debian.
* Fix update-alternatives to use the current alternative link as the first
diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index bebaa07..6049496 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -157,6 +157,21 @@ The \s-1GNU\s0 system type of the host machine.
The clarified \s-1GNU\s0 system type of the host machine, used for filesystem
paths.
.
+.SH FILES
+All these files have to be present for \fBdpkg\-architecture\fP to
+work. Their location can be overridden at runtime with the environment
+variable \fBDPKG_DATADIR\fP.
+.TP
+.I /usr/share/dpkg/cputable
+Table of known CPU names and mapping to their GNU name.
+.TP
+.I /usr/share/dpkg/ostable
+Table of known operating system names and mapping to their GNU name.
+.TP
+.I /usr/share/dpkg/triplettable
+Mapping between Debian architecture triplets and Debian architecture
+names.
+.
.SH DEBIAN/RULES
The environment variables set by \fBdpkg\-architecture\fP are passed to
\fIdebian/rules\fP as make variables (see make documentation). However,
@@ -240,21 +255,6 @@ dpkg\-architecture \-ilinux\-any
.IP
dpkg\-architecture \-ai386 \-ilinux\-any
.
-.SH FILES
-All these files have to be present for \fBdpkg\-architecture\fP to
-work. Their location can be overridden at runtime with the environment
-variable \fBDPKG_DATADIR\fP.
-.TP
-.I /usr/share/dpkg/cputable
-Table of known CPU names and mapping to their GNU name.
-.TP
-.I /usr/share/dpkg/ostable
-Table of known operating system names and mapping to their GNU name.
-.TP
-.I /usr/share/dpkg/triplettable
-Mapping between Debian architecture triplets and Debian architecture
-names.
-.
.SH SEE ALSO
.BR dpkg\-buildpackage (1),
.BR dpkg\-cross (1).
diff --git a/man/dpkg-buildflags.1 b/man/dpkg-buildflags.1
index 8d36230..d36e7e2 100644
--- a/man/dpkg-buildflags.1
+++ b/man/dpkg-buildflags.1
@@ -162,51 +162,6 @@ and
.B ,
have to be stripped from these options). Default value: empty.
.
-.SH FILES
-.TP
-.B /etc/dpkg/buildflags.conf
-System wide configuration file.
-.TP
-.BR $XDG_CONFIG_HOME/dpkg/buildflags.conf " or "
$HOME/.config/dpkg/buildflags.conf
-User configuration file.
-.SH ENVIRONMENT
-There are 2 sets of environment variables doing the same operations, the
-first one (DEB_\fIflag\fP_\fIop\fP) should never be used within
-\fBdebian/rules\fP. It's meant for any user that wants to rebuild the
-source package with different build flags. The second set
-(DEB_\fIflag\fP_MAINT_\fIop\fP) should only be used in \fBdebian/rules\fP
-by package maintainers to change the resulting build flags.
-.TP
-.BI DEB_ flag _SET
-.TQ
-.BI DEB_ flag _MAINT_SET
-This variable can be used to force the value returned for the given
-\fIflag\fP.
-.TP
-.BI DEB_ flag _STRIP
-.TQ
-.BI DEB_ flag _MAINT_STRIP
-This variable can be used to provide a space separated list of options
-that will be stripped from the set of flags returned for the given
-\fIflag\fP.
-.TP
-.BI DEB_ flag _APPEND
-.TQ
-.BI DEB_ flag _MAINT_APPEND
-This variable can be used to append supplementary options to the value
-returned for the given \fIflag\fP.
-.TP
-.BI DEB_ flag _PREPEND
-.TQ
-.BI DEB_ flag _MAINT_PREPEND
-This variable can be used to prepend supplementary options to the value
-returned for the given \fIflag\fP.
-.TP
-.B DEB_BUILD_MAINT_OPTIONS
-This variable can be used to disable/enable various hardening build
-flags through the \fBhardening\fP option. See the \fBHARDENING\fP section
-for details.
-.
.SH HARDENING
Several compile-time options (detailed below) can be used to help harden
a resulting binary against memory corruption attacks, or provide
@@ -307,3 +262,49 @@ architectures (most notably i386) can see performance
losses of up to
15% in very text-segment-heavy application workloads; most workloads
see less than 1%. Architectures with more general registers (e.g. amd64)
do not see as high a worst-case penalty.
+.
+.SH ENVIRONMENT
+There are 2 sets of environment variables doing the same operations, the
+first one (DEB_\fIflag\fP_\fIop\fP) should never be used within
+\fBdebian/rules\fP. It's meant for any user that wants to rebuild the
+source package with different build flags. The second set
+(DEB_\fIflag\fP_MAINT_\fIop\fP) should only be used in \fBdebian/rules\fP
+by package maintainers to change the resulting build flags.
+.TP
+.BI DEB_ flag _SET
+.TQ
+.BI DEB_ flag _MAINT_SET
+This variable can be used to force the value returned for the given
+\fIflag\fP.
+.TP
+.BI DEB_ flag _STRIP
+.TQ
+.BI DEB_ flag _MAINT_STRIP
+This variable can be used to provide a space separated list of options
+that will be stripped from the set of flags returned for the given
+\fIflag\fP.
+.TP
+.BI DEB_ flag _APPEND
+.TQ
+.BI DEB_ flag _MAINT_APPEND
+This variable can be used to append supplementary options to the value
+returned for the given \fIflag\fP.
+.TP
+.BI DEB_ flag _PREPEND
+.TQ
+.BI DEB_ flag _MAINT_PREPEND
+This variable can be used to prepend supplementary options to the value
+returned for the given \fIflag\fP.
+.TP
+.B DEB_BUILD_MAINT_OPTIONS
+This variable can be used to disable/enable various hardening build
+flags through the \fBhardening\fP option. See the \fBHARDENING\fP section
+for details.
+.
+.SH FILES
+.TP
+.B /etc/dpkg/buildflags.conf
+System wide configuration file.
+.TP
+.BR $XDG_CONFIG_HOME/dpkg/buildflags.conf " or "
$HOME/.config/dpkg/buildflags.conf
+User configuration file.
diff --git a/man/dpkg-divert.8 b/man/dpkg-divert.8
index 42feead..311a6e1 100644
--- a/man/dpkg-divert.8
+++ b/man/dpkg-divert.8
@@ -95,6 +95,26 @@ Show the usage message and exit.
.B \-\-version
Show the version and exit.
.
+.SH ENVIRONMENT
+.TP
+.B DPKG_ADMINDIR
+If set and the \fB\-\-admindir\fP option has not been specified, it will
+be used as the dpkg data directory.
+.TP
+.B DPKG_MAINTSCRIPT_PACKAGE
+If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been
+specified, \fBdpkg\-divert\fP will use it as the package name.
+.
+.SH FILES
+.TP
+.I /var/lib/dpkg/diversions
+File which contains the current list of diversions of the system. It is
+located in the dpkg administration directory, along with other files
+important to dpkg, such as \fIstatus\fP or \fIavailable\fP.
+.br
+Note: \fBdpkg\-divert\fP preserves the old copy of this file, with extension
+\fI\-old\fP, before replacing it with the new one.
+.
.SH NOTES
When adding, default is \fB\-\-local\fP and \fB\-\-divert\fP
\fIoriginal\fP\fB.distrib\fP. When removing, \fB\-\-package\fP or
@@ -129,25 +149,5 @@ To remove that diversion:
.HP
dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
.
-.SH ENVIRONMENT
-.TP
-.B DPKG_ADMINDIR
-If set and the \fB\-\-admindir\fP option has not been specified, it will
-be used as the dpkg data directory.
-.TP
-.B DPKG_MAINTSCRIPT_PACKAGE
-If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been
-specified, \fBdpkg\-divert\fP will use it as the package name.
-.
-.SH FILES
-.TP
-.I /var/lib/dpkg/diversions
-File which contains the current list of diversions of the system. It is
-located in the dpkg administration directory, along with other files
-important to dpkg, such as \fIstatus\fP or \fIavailable\fP.
-.br
-Note: \fBdpkg\-divert\fP preserves the old copy of this file, with extension
-\fI\-old\fP, before replacing it with the new one.
-.
.SH SEE ALSO
.BR dpkg (1).
diff --git a/man/dpkg.1 b/man/dpkg.1
index a25a348..65b2885 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -670,48 +670,6 @@ may leave packages in the improper \fBtriggers\-awaited\fP
and
\fB\-\-triggers\fP
Cancels a previous \fB\-\-no\-triggers\fP.
.
-.SH FILES
-.TP
-.I /etc/dpkg/dpkg.cfg.d/[0-9a-zA-Z_-]*
-Configuration fragment files.
-.TP
-.I /etc/dpkg/dpkg.cfg
-Configuration file with default options.
-.TP
-.I /var/log/dpkg.log
-Default log file (see \fI/etc/dpkg/dpkg.cfg\fP(5) and option
-\fB\-\-log\fP).
-.P
-The other files listed below are in their default directories, see option
-\fB\-\-admindir\fP to see how to change locations of these files.
-.TP
-.I /var/lib/dpkg/available
-List of available packages.
-.TP
-.I /var/lib/dpkg/status
-Statuses of available packages. This file contains information about
-whether a package is marked for removing or not, whether it is
-installed or not, etc. See section \fBINFORMATION ABOUT PACKAGES\fP
-for more info.
-
-The status file is backed up daily in \fI/var/backups\fP. It can be
-useful if it's lost or corrupted due to filesystems troubles.
-.P
-The following files are components of a binary package. See \fBdeb\fP(5)
-for more information about them:
-.TP
-.I control
-.TP
-.I conffiles
-.TP
-.I preinst
-.TP
-.I postinst
-.TP
-.I prerm
-.TP
-.I postrm
-.
.SH ENVIRONMENT
.TP
.B HOME
@@ -760,6 +718,48 @@ architecture the package got built for.
Defined by \fBdpkg\fP on the maintainer script environment to the
name of the script running (preinst, postinst, prerm, postrm).
.
+.SH FILES
+.TP
+.I /etc/dpkg/dpkg.cfg.d/[0-9a-zA-Z_-]*
+Configuration fragment files.
+.TP
+.I /etc/dpkg/dpkg.cfg
+Configuration file with default options.
+.TP
+.I /var/log/dpkg.log
+Default log file (see \fI/etc/dpkg/dpkg.cfg\fP(5) and option
+\fB\-\-log\fP).
+.P
+The other files listed below are in their default directories, see option
+\fB\-\-admindir\fP to see how to change locations of these files.
+.TP
+.I /var/lib/dpkg/available
+List of available packages.
+.TP
+.I /var/lib/dpkg/status
+Statuses of available packages. This file contains information about
+whether a package is marked for removing or not, whether it is
+installed or not, etc. See section \fBINFORMATION ABOUT PACKAGES\fP
+for more info.
+
+The status file is backed up daily in \fI/var/backups\fP. It can be
+useful if it's lost or corrupted due to filesystems troubles.
+.P
+The following files are components of a binary package. See \fBdeb\fP(5)
+for more information about them:
+.TP
+.I control
+.TP
+.I conffiles
+.TP
+.I preinst
+.TP
+.I postinst
+.TP
+.I prerm
+.TP
+.I postrm
+.
.SH BUGS
\fB\-\-no\-act\fP usually gives less information than might be helpful.
.
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
