[debhelper-devel] [debhelper] 01/01: dh_installdocs: Fix regression wrt symlinked doc directory
Niels Thykier
nthykier at moszumanska.debian.org
Fri Jul 8 09:44:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit 863ef397c939340e863be1e96c822934a3167852
Author: Sven Joachim <svenjoac at gmx.de>
Date: Fri Jul 8 10:41:41 2016 +0200
dh_installdocs: Fix regression wrt symlinked doc directory
If a package uses dh_installdocs' --link-doc option, install_dir could
fail with an error message from install(1), because the symlink might
be dangling. Use ensure_docdir instead which was designed precisely
for this case.
Regression introduced in commit 71007f72da682dd9d7f932d81ca2ecd5d46a0e70.
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debian/changelog | 3 +++
dh_installdocs | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 8f47fc4..f34a379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ debhelper (9.20160702) unstable; urgency=medium
of relying on it implicitly via libdpkg-perl.
* dh_shlibdeps: Clarify that -L is also useful for packages
using debian/shlibs.local for private libraries.
+ * dh_installdocs: Apply patch from Sven Joachim to fix a
+ regression with --link-doc and installing extra
+ documentation. (Closes: #830309)
[ Translations ]
* Update German translation (Chris Leick + Eduard Bloch)
diff --git a/dh_installdocs b/dh_installdocs
index a42a98d..41e0883 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";
- install_dir($target_dir);
+ ensure_docdir($target_package);
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
More information about the debhelper-devel
mailing list