[Reproducible-commits] [dpkg] 11/74: man: Merge ENVIRONMENT sections in dpkg-buildflags(1)

[Mattia Rizzolo]

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

mattia pushed a commit to annotated tag 1.18.8
in repository dpkg.

commit 1b09bbc32b5b5fa838ac308f9698eebd56e268d1
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Jul 3 12:56:29 2016 +0200

    man: Merge ENVIRONMENT sections in dpkg-buildflags(1)
---
 debian/changelog      |  1 +
 man/dpkg-buildflags.1 | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61108cb..a9e60d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dpkg (1.18.8) UNRELEASED; urgency=medium
     - Document the tar entry size limitation for deb(5) format.
     - Document interaction between PIE and libraries in dpkg-buildflags(1).
       Based on text by Christian Seiler <christian at iwakd.de>.
+    - Merge ENVIRONMENT sections in dpkg-buildflags(1).
 
   [ Updated programs translations ]
   * German (Sven Joachim).
diff --git a/man/dpkg-buildflags.1 b/man/dpkg-buildflags.1
index f490a48..8898689 100644
--- a/man/dpkg-buildflags.1
+++ b/man/dpkg-buildflags.1
@@ -460,6 +460,11 @@ various area features that affect build flags.
 The \fBDEB_BUILD_MAINT_OPTIONS\fP variable overrides any setting in the
 \fBDEB_BUILD_OPTIONS\fP feature areas.
 See the \fBFEATURE AREAS\fP section for details.
+.TP
+.B DEB_VENDOR
+This setting defines the current vendor.
+If not set, it will discover the current vendor by reading
+\fB\%/etc/dpkg/origins/default\fP.
 .
 .SH FILES
 .SS Configuration files
@@ -477,12 +482,6 @@ User configuration file.
 Makefile snippet that will load (and optionally export) all flags
 supported by \fBdpkg-buildflags\fP into variables (since dpkg 1.16.1).
 .
-.SH ENVIRONMENT
-.TP
-.B DEB_VENDOR
-This setting defines the current vendor. If not set, it will discover the
-current vendor by reading \fB\%/etc/dpkg/origins/default\fP.
-.
 .SH EXAMPLES
 To pass build flags to a build command in a makefile:
 .PP

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