[debhelper-devel] [debhelper] 01/01: dh_installdirs: in c11 - don't create d/<pkg> unconditionally

[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 6720ebbbbde08e35072f53b13861fbcccee1e6ed
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Oct 5 18:22:02 2016 +0000

    dh_installdirs: in c11 - don't create d/<pkg> unconditionally
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod    | 8 ++++++++
 debian/changelog | 5 +++++
 dh_installdirs   | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debhelper.pod b/debhelper.pod
index bfc5e19..f3edcf5 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -605,6 +605,14 @@ B<--mainpackage> option.
 
 Please remember to check/update your doc-base files.
 
+=item -
+
+B<dh_installdirs> no longer creates debian/I<package> directories
+unless explicitly requested (or it has to create a subdirectory in
+it).
+
+The vast majority of all packages will be unaffected by this change.
+
 =back
 
 =back
diff --git a/debian/changelog b/debian/changelog
index 6b4117e..24575ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,11 @@ debhelper (10.2.2) UNRELEASED; urgency=medium
     build-system is now also used directly for "clean" and
     "build" (while still usin the "make" build-system for the
     heavy lifting).  (Closes: #839681)
+  * dh_installdirs: In compat 11, avoid creating debian/<pkg>
+    directories except when required to do so.  This fixes a
+    corner case, where an arch:all build would behave
+    differently than an arch:all+arch:any when dh_installdir is
+    optimised out only for the arch:all build.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 02 Oct 2016 09:52:08 +0000
 
diff --git a/dh_installdirs b/dh_installdirs
index 0ea9dd4..df04e4a 100755
--- a/dh_installdirs
+++ b/dh_installdirs
@@ -63,7 +63,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $file=pkgfile($package,"dirs");
 
-	install_dir($tmp);
+	install_dir($tmp) if compat(10);
 
 	my @dirs;
 

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