[debhelper-devel] [debhelper] 02/02: dh: Revert --without=build-stamp in c11

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 822c58949f2af7087541968810000fe57448a941
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jul 9 12:41:56 2017 +0000

    dh: Revert --without=build-stamp in c11
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod    | 13 -------------
 debian/changelog |  3 +++
 dh               | 18 +++++++++++-------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/debhelper.pod b/debhelper.pod
index d8a02ed..036bde2 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -610,19 +610,6 @@ The vast majority of all packages will be unaffected by this change.
 
 =item -
 
-B<dh> no longer creates a stamp (or log) file to record whether the
-build already ran or not.  This means that unless upstream's build
-system correctly tracks this, the build will be run twice (once for
-the "build" target and once for the "binary" target).
-
-On the other hand, this means that rebuild without cleaning
-(e.g. B<dpkg-buildpackage -nc>) will behave as most people would
-expect.
-
-The previous behaviour can restored by using B<--with build-stamp>
-
-=item -
-
 The B<makefile> buildsystem now passes B<INSTALL=install
 --strip-program=true> to L<make(1)>.  Derivative buildsystems
 (e.g. B<configure> or B<cmake>) are unaffected by this change.
diff --git a/debian/changelog b/debian/changelog
index bca6381..9ff5c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ debhelper (10.6.4) UNRELEASED; urgency=medium
 
   * dh_installmenu: Revert "Stop installing menu files in compat 11
     (menu-methods are still installed)".
+  * dh: Revert "--without=build-stamp by default in compat 11".  Keep
+    the compat 10 behaviour while enable packages to opt-in by
+    explicitly passing --without=build-stamp themselves.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 09 Jul 2017 12:30:20 +0000
 
diff --git a/dh b/dh
index 8f26824..033749e 100755
--- a/dh
+++ b/dh
@@ -218,10 +218,16 @@ If you're curious about B<dh>'s internals, here's how it works under the hood.
 
 In compat 10 (or later), B<dh> creates a stamp file
 F<debian/debhelper-build-stamp> after the build step(s) are complete
-to avoid re-running them.  Inside an override target, B<dh_*> commands
-will create a log file F<debian/package.debhelper.log> to keep track
-of which packages the command(s) have been run for.  These log files
-are then removed once the override target is complete.
+to avoid re-running them.  It is possible to avoid the stamp file by
+passing B<--without=build-stamp> to B<dh>.  This makes "no clean"
+builds behave more like what some people expect at the expense of
+possibly running the build and test twice (the second time as root or
+under L<fakeroot(1)>).
+
+Inside an override target, B<dh_*> commands will create a log file
+F<debian/package.debhelper.log> to keep track of which packages the
+command(s) have been run for.  These log files are then removed once
+the override target is complete.
 
 In compat 9 or earlier, each debhelper command will record
 when it's successfully run in F<debian/package.debhelper.log>. (Which
@@ -291,9 +297,7 @@ if (not compat(9, 1)) {
 	# Enable systemd support by default in compat 10 or later.
 	unshift(@ARGV, "--with=systemd");
 }
-if (compat(10, 1)) {
-	unshift(@ARGV, "--with=build-stamp");
-}
+unshift(@ARGV, "--with=build-stamp");
 
 
 inhibit_log();

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