[debhelper-devel] [debhelper] 01/01: dh_installdocs: Fix regression in compat 11 mode

[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 6c946cd0bb239a4fd02e7acbcb797ecccfb0e3cb
Author: Sven Joachim <svenjoac at gmx.de>
Date:   Sat Jul 9 12:18:41 2016 +0200

    dh_installdocs: Fix regression in compat 11 mode
    
    The change in commit 863ef397c939340e863be1e96c822934a3167852 was not
    quite correct, since ensure_docdir would create the doc directory
    under debian/$dh{MAINPACKAGE} rather than debian/$package in C11 mode.
    
    Restore the previous code and fix the original problem in bug #830309
    ("install: cannot change permissions of
    'debian/$package/usr/share/doc/$package': No such file or directory")
    by only creating the directory if it is not already a symlink, as is
    the case with the --link-doc option.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 7 +++++++
 dh_installdocs   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0eb991e..3f28166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20160709+unreleased) UNRELEASED; urgency=medium
+
+  * dh_installdocs: Apply patch from Sven Joachim to make
+    --link-doc work again in compat 11 (See: #830309)
+
+ -- Niels Thykier <niels at thykier.net>  Sat, 09 Jul 2016 11:51:46 +0000
+
 debhelper (9.20160709) unstable; urgency=medium
 
   * Explicitly Build-Depends on perl:any for pod2man instead
diff --git a/dh_installdocs b/dh_installdocs
index 41e0883..d7bb24f 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -227,7 +227,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$target_package = $dh{MAINPACKAGE};
 		}
 		my $target_dir = "$tmp/usr/share/doc/$target_package";
-		ensure_docdir($target_package);
+		install_dir($target_dir) unless -l $target_dir;
 		foreach my $doc (@docs) {
 			next if excludefile($doc);
 			next if -e $doc && ! -s $doc; # ignore empty files

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