[dpkg] 41/187: man: Turn the Multi-Arch values into a list

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository dpkg.

commit 47da670a4743bc08d704dd6aa92111b582c96582
Author: Guillem Jover <guillem at debian.org>
Date:   Mon Oct 3 04:01:17 2016 +0200

    man: Turn the Multi-Arch values into a list
    
    This should make it easier to scan.
---
 debian/changelog  |  1 +
 man/deb-control.5 | 35 +++++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a767cce..46c3ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     - Switch deb-triggers(5) types into a proper list.
     - Itemize --log format entries in dpkg(1).
     - Turn the update-alternatives(1) --query example item into a sub-section.
+    - Turn the Multi-Arch values into a list in deb-control(5).
   * Build system:
     - Add support for profiling perl modules.
     - Clean up compiler and linker automatic flag usage in configure.
diff --git a/man/deb-control.5 b/man/deb-control.5
index 3621e52..0255915 100644
--- a/man/deb-control.5
+++ b/man/deb-control.5
@@ -129,21 +129,32 @@ The upstream project home page \fIurl\fP.
 List of tags describing the qualities of the package. The description and
 list of supported tags can be found in the \fB\%debtags\fP package.
 .TP
-.BR Multi\-Arch: " \fBsame\fP|\fBforeign\fP|\fBallowed\fP|\fBno\fP"
+.BR Multi\-Arch: " \fBno\fP|\fBsame\fP|\fBforeign\fP|\fBallowed\fP"
 This field is used to indicate how this package should behave on a multi-arch
-installations. The value \fBsame\fP means that the package is co-installable
-with itself, but it must not be used to satisfy the dependency of any package
-of a different architecture from itself.
-The value \fBforeign\fP means that the package is not co-installable with
-itself, but should be allowed to satisfy a non-arch-qualified dependency of
-a package of a different arch from itself (if a dependency has an explicit
-arch-qualifier then the value \fBforeign\fP is ignored).
-The value \fBallowed\fP allows reverse-dependencies to indicate in their
-\fBDepends\fP field that they accept a package from a foreign architecture by
-qualifying the package name with \fB:any\fP, but has no effect otherwise.
-The value \fBno\fP is the default when the field is omitted, in which case
+installations.
+.RS
+.TP
+.B no
+This value is the default when the field is omitted, in which case
 adding the field with an explicit \fBno\fP value is generally not needed.
 .TP
+.B same
+This package is co-installable with itself, but it must not be used to
+satisfy the dependency of any package of a different architecture from
+itself.
+.TP
+.B foreign
+This package is not co-installable with itself, but should be allowed to
+satisfy a non-arch-qualified dependency of a package of a different arch
+from itself (if a dependency has an explicit arch-qualifier then the
+value \fBforeign\fP is ignored).
+.TP
+.B allowed
+This allows reverse-dependencies to indicate in their \fBDepends\fP
+field that they accept this package from a foreign architecture by
+qualifying the package name with \fB:any\fP, but has no effect otherwise.
+.RE
+.TP
 .BR Source: " \fIsource-name\fP [\fB(\fP\fIsource-version\fP\fB)\fP]"
 The name of the source package that this binary package came from, if it is
 different than the name of the package itself.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git