[dpkg] 69/192: man: Sort control field export markers by tool order

[Ximin Luo]

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

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

commit a6c063d50048a04d023785540fda910e9de9a304
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Jul 8 18:13:50 2017 +0200

    man: Sort control field export markers by tool order
    
    First we list source, then binary, then changes.
---
 debian/changelog        |  1 +
 man/deb-src-control.man | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45d62df..e19636d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
     - Add all source files to POTFILES.in files.
     - Move deb-version man page to section 7.
     - Remove reference to obsolete dpkg-cross(1).
+    - Sort control field export markers by tool order in deb-src-control(5).
   * Build system:
     - Require Perl 5.20.2, the version in Debian oldstable (jessie).
     - Use new gcc-7 -Wrestrict and -Wshift-negative-value warnings if
diff --git a/man/deb-src-control.man b/man/deb-src-control.man
index 07b85d3..0507150 100644
--- a/man/deb-src-control.man
+++ b/man/deb-src-control.man
@@ -352,22 +352,22 @@ It is allowed to add additional user-defined fields to the control file. The
 tools will ignore these fields. If you want the fields to be copied over to
 the output files, such as the binary packages, you need to use a custom naming
 scheme: the fields should start with an \fBX\fP, followed by zero or more of
-the letters \fBBCS\fP and a hyphen.
+the letters \fBSBC\fP and a hyphen.
 
 .TP
+.B S
+The field will appear in the source package control file, see \fBdsc\fP(5).
+.TP
 .B B
 The field will appear in the control file in the binary package, see
 \fBdeb\-control\fP(5).
 .TP
-.B S
-The field will appear in the source package control file, see \fBdsc\fP(5).
-.TP
 .B C
 The field will appear in the upload control (.changes) file, see
 \fBdeb\-changes\fP(5).
 
 .P
-Note that the \fBX\fP[\fBBCS\fP]\fB\-\fP prefixes are stripped when the
+Note that the \fBX\fP[\fBSBC\fP]\fB\-\fP prefixes are stripped when the
 fields are copied over to the output files. A field \fBXC\-Approved\-By\fP
 will appear as \fBApproved\-By\fP in the changes file and will not appear
 in the binary or source package control files.

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