[Reproducible-commits] [dpkg] 17/90: man: Document multiarch triplet in dpkg-architecture(1) TERMS section

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 6b16edc08b4cf7253e3349fcd98142d5aee629a8
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Jul 26 18:55:52 2015 +0200

    man: Document multiarch triplet in dpkg-architecture(1) TERMS section
    
    Also make it a bit more clear by changing the “GNU system type” example
    to use something else than i386, which is the only current difference
    between these terms.
---
 debian/changelog        |  1 +
 man/dpkg-architecture.1 | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f755df..66507d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ dpkg (1.18.2) UNRELEASED; urgency=low
     - Document abitable in dpkg-architecture(1).
     - Clarify that an architecture wildcard is a Debian thing in
       dpkg-architecture(1).
+    - Document multiarch triplet in dpkg-architecture(1) TERMS section.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #789097
diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index 71558c1..6be366d 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -145,8 +145,16 @@ any real architecture being part of it. The general form is <kernel>\-<cpu>.
 Examples: linux\-any, any\-i386, hurd\-any.
 .IP "GNU system type" 4
 An architecture specification string consisting of two parts separated by
-a hyphen: cpu and system. Examples: i386\-linux\-gnu, sparc\-linux\-gnu,
-i386\-gnu, x86_64\-netbsd.
+a hyphen: cpu and system.
+Examples: i586\-linux\-gnu, sparc\-linux\-gnu, i686\-gnu, x86_64\-netbsd.
+.IP "multiarch triplet" 4
+The clarified GNU system type, used for filesystem paths.
+This triplet does not change even when the baseline ISA gets bumped,
+so that the resulting paths are stable over time.
+The only current difference with the GNU system type is that the CPU part
+for i386 based systems is always i386.
+Examples: i386\-linux\-gnu, x86_64\-linux\-gnu.
+Example paths: /lib/powerpc64le-linux-gnu/, /usr/lib/i386-kfreebsd-gnu/.
 .
 .SH VARIABLES
 The following variables are set by \fBdpkg\-architecture\fP:

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