ソースを参照

man: Turn the Multi-Arch values into a list

This should make it easier to scan.
Guillem Jover 9 年 前
コミット
47da670a47
共有2 個のファイルを変更した24 個の追加12 個の削除を含む
  1. 1 0
      debian/changelog
  2. 23 12
      man/deb-control.5

+ 1 - 0
debian/changelog

@@ -19,6 +19,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     - Switch deb-triggers(5) types into a proper list.
     - Switch deb-triggers(5) types into a proper list.
     - Itemize --log format entries in dpkg(1).
     - Itemize --log format entries in dpkg(1).
     - Turn the update-alternatives(1) --query example item into a sub-section.
     - 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:
   * Build system:
     - Add support for profiling perl modules.
     - Add support for profiling perl modules.
     - Clean up compiler and linker automatic flag usage in configure.
     - Clean up compiler and linker automatic flag usage in configure.

+ 23 - 12
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 tags describing the qualities of the package. The description and
 list of supported tags can be found in the \fB\%debtags\fP package.
 list of supported tags can be found in the \fB\%debtags\fP package.
 .TP
 .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
 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.
 adding the field with an explicit \fBno\fP value is generally not needed.
 .TP
 .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]"
 .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
 The name of the source package that this binary package came from, if it is
 different than the name of the package itself.
 different than the name of the package itself.