Enable dwz in c12 by default

Closes: nthykier/debhelper#3
Signed-off-by: Niels Thykier <niels@thykier.net>

4 files changed, 13 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 5aa2c0d3..0d2310e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,11 @@ debhelper (11.3) UNRELEASED; urgency=medium
     had a valid symlink to it.  Thanks to Andreas Hasenack for
     reporting the bug.  (Closes: LP: #1765851)
   * debian/control: Depend on dwz for dh_dwz.
+  * dh_dwz: Generate a per-package multifile by default.  This
+    feature can be disabled by --no-multifile.
+  * dh: Run dh_dwz by default in compat 12.
+  * dh_dwz/dwz.pm: Remove warning about the dwz feature being
+    experimental.
 
   [ Dmitry Shachnev ]
   * qmake.pm: Use ${DEB_HOST_GNU_TYPE}-qmake wrapper for
diff --git a/dh b/dh
index fb3b7776..10b018bb 100755
--- a/dh
+++ b/dh
@@ -432,11 +432,13 @@ qw{
 	dh_fixperms
 	dh_missing
 });
-my @ba=qw{
+my @ba=(
+	(!compat(11) ? qw(dh_dwz) : qw()),
+qw{
 	dh_strip
 	dh_makeshlibs
 	dh_shlibdeps
-};
+});
 if (! getpackages("arch")) {
 	@ba=();
 }
diff --git a/dh_dwz b/dh_dwz
index 66a33e5d..b90121f1 100755
--- a/dh_dwz
+++ b/dh_dwz
@@ -80,8 +80,6 @@ init(options => {
 # This variable can be used to turn off stripping (see Policy).
 exit 0 if get_buildoption('nostrip');
 
-warning('This tool is experimental and may change (or be retired) without any notice');
-
 my @elf_files;
 
 sub testfile {
diff --git a/lib/Debian/Debhelper/Sequence/dwz.pm b/lib/Debian/Debhelper/Sequence/dwz.pm
index 3db77561..eb8ef13e 100644
--- a/lib/Debian/Debhelper/Sequence/dwz.pm
+++ b/lib/Debian/Debhelper/Sequence/dwz.pm
@@ -3,9 +3,11 @@
 
 use strict;
 use warnings;
-use Debian::Debhelper::Dh_Lib qw(warning);
+use Debian::Debhelper::Dh_Lib;
 
-warning('The "dwz"-sequence is experimental and may change (or be retired) without any notice');
+if (not compat(11)) {
+	error("In compat 12, dh_dwz is run by default and the dwz-sequence is no longer required.");
+}
 
 insert_before('dh_strip', 'dh_dwz');