summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--man/deb-control.55
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index cf52267..fd45759 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,8 @@ dpkg (1.16.2) UNRELEASED; urgency=low
to pass an explicit patch file to dpkg-source --commit.
* Add new --query-features command to dpkg-buildflags. Thanks to Kees Cook
for the patch. Closes: #651481
+ * Fix description of Multi-Arch in deb-control(5). Closes: #654453
+ Thanks to Jakub Wilk for spotting the mistake.
[ Jonathan Nieder ]
* Bump po4a version in Build-Depends to 0.41, since earlier versions do
diff --git a/man/deb-control.5 b/man/deb-control.5
index 51a7c9a..74949b9 100644
--- a/man/deb-control.5
+++ b/man/deb-control.5
@@ -107,9 +107,8 @@ 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 the dependency of a package of a different arch from itself. The
value \fBallowed\fP allows reverse-dependencies to indicate in their
-Depends field that they need a package from a foreign architecture, but
-has no effect otherwise. This field should not be present in packages
-with the \fBArchitecture: all\fP field.
+Depends field that they accept a package from a foreign architecture, but
+has no effect otherwise.
.TP
.BI Source: " source-name"
The name of the source package that this binary package came from, if