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

guillem pushed a commit to branch master
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=0a1573e5df2f38eb0d2c2c29654cb8c352474c1e

commit 0a1573e5df2f38eb0d2c2c29654cb8c352474c1e
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Tue Jul 24 00:47:01 2018 +0200

    dpkg-buildpackage: Clarify pre and post-clean options and their default 
state
---
 debian/changelog             | 2 ++
 man/dpkg-buildpackage.man    | 3 ++-
 scripts/dpkg-buildpackage.pl | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d449738a..71ccbbc37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Update git URLs for move away from alioth.debian.org.
     - Fix set_build_type_from_options() description in Dpkg::Build::Types.
     - Clarify PIE build flag feature semantics. Closes: #900088
+    - Clarify dpkg-buildpackage pre and post-clean options and their default
+      state.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index 4b3256e4b..10c853ba2 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -281,13 +281,14 @@ Do not honor the \fBRules\-Requires\-Root\fP field, 
falling back to its
 legacy default value (since dpkg 1.19.1).
 .TP
 .BR \-nc ", " \-\-no\-pre\-clean
-Do not clean the source tree (long option since dpkg 1.18.8).
+Do not clean the source tree before building (long option since dpkg 1.18.8).
 Implies \fB\-b\fP if nothing else has been selected among \fB\-F\fP,
 \fB\-g\fP, \fB\-G\fP, \fB\-B\fP, \fB\-A\fP or \fB\-S\fP.
 Implies \fB\-d\fP with \fB\-S\fP (since dpkg 1.18.0).
 .TP
 .BR \-\-pre\-clean
 Clean the source tree before building (since dpkg 1.18.8).
+This is the default behavior.
 .TP
 .BR \-tc ", " \-\-post\-clean
 Clean the source tree (using
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 1eabd13d2..9bc8c9d28 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -71,9 +71,9 @@ sub usage {
   -A                          binary-only, only arch-indep files.
   -S                          source-only, no binary files.
   -nc, --no-pre-clean         do not pre clean source tree (implies -b).
-       --pre-clean            pre clean source tree (default).
+      --pre-clean             pre clean source tree (default).
       --no-post-clean         do not post clean source tree (default).
-  -tc, --post-clean           clean source tree when finished.
+  -tc, --post-clean           post clean source tree.
   -D                          check build dependencies and conflicts (default).
   -d                          do not check build dependencies and conflicts.
       --[no-]check-builddeps  ditto.

-- 
Dpkg.Org's dpkg

Reply via email to