[dpkg] 04/08: FIXME: more cleanup

[Mattia Rizzolo]

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

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

commit e4632bfed4e19fcdbb9cdd82a733a74fc7d87505
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Jul 24 23:19:08 2016 +0200

    FIXME: more cleanup
---
 debian/dpkg-dev.manpages |  1 +
 man/dpkg-buildpackage.1  |  4 ++--
 man/dpkg-genbuildinfo.1  | 25 ++++++++++++++++++++-----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/debian/dpkg-dev.manpages b/debian/dpkg-dev.manpages
index 36e4254..0fabad4 100644
--- a/debian/dpkg-dev.manpages
+++ b/debian/dpkg-dev.manpages
@@ -1,3 +1,4 @@
+debian/tmp/usr/share/man/*/deb-buildinfo.5
 debian/tmp/usr/share/man/*/deb-changelog.5
 debian/tmp/usr/share/man/*/deb-changes.5
 debian/tmp/usr/share/man/*/deb-control.5
diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1
index 524e00d..8b77794 100644
--- a/man/dpkg-buildpackage.1
+++ b/man/dpkg-buildpackage.1
@@ -361,13 +361,13 @@ The source package version (without the epoch).
 The upstream version.
 .RE
 .TP
-.BI \-\-buildinfo-identifier= identifier
+.BI \-\-buildinfo-id= identifier
 Specify the identifier part of the \fB.buildinfo\fP file name
 (since dpkg 1.18.10).
 By default, \fBdpkg\-buildpackage\fP will create an identifier using
 the current time and the first characters of the MD5 hash.
 An arbitrary identifier can be specified as a replacement.
-The identifier has the same restriction as package names: they must consist
+The identifier has the same restriction as package names: it must consist
 only of lower case letters (a-z), digits (0-9), plus (+) and minus (\-)
 signs, and periods (.), be at least two characters long and must start
 with an alphanumeric character.
diff --git a/man/dpkg-genbuildinfo.1 b/man/dpkg-genbuildinfo.1
index 33fc700..439d89e 100644
--- a/man/dpkg-genbuildinfo.1
+++ b/man/dpkg-genbuildinfo.1
@@ -96,14 +96,29 @@ rather than
 (\fBdpkg\-genbuildinfo\fP needs to find these files so that it can include
 their sizes and checksums in the \fB.buildinfo\fP file).
 .TP
-.BI \-\-admindir= dir
-Change the location of the \fBdpkg\fR database. The default location is
-\fI/var/lib/dpkg\fP.
+.BI \-\-buildinfo-id= identifier
+Specify the identifier part of the \fB.buildinfo\fP file name.
+By default, \fBdpkg\-genbuildinfo\fP will create an identifier using
+the current time and the first characters of the MD5 hash.
+An arbitrary identifier can be specified as a replacement.
+The identifier has the same restriction as package names: it must consist
+only of lower case letters (a-z), digits (0-9), plus (+) and minus (\-)
+signs, and periods (.), be at least two characters long and must start
+with an alphanumeric character.
 .TP
 .BI \-\-always\-include\-path
 By default, the \fBBuild\-Path\fR field will only be written if the current
-directory starts with \fB/build/\fR. Specify this option to always write
-a \fBBuild\-Path\fR field when generating the \fB.buildinfo\fR.
+directory starts with a whitelisted pattern.
+
+On Debian and derivatives the pattern matches on \fB/build/\fR at the start
+of the pathname.
+
+Specify this option to always write a \fBBuild\-Path\fR field when generating
+the \fB.buildinfo\fR.
+.TP
+.BI \-\-admindir= dir
+Change the location of the \fBdpkg\fR database. The default location is
+\fI/var/lib/dpkg\fP.
 .TP
 .B \-q
 .B dpkg\-genbuildinfo

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