diff options
| author | Sven Joachim <svenjoac@gmx.de> | 2016-07-09 12:18:41 +0200 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2016-07-09 11:53:03 +0000 |
| commit | 6c946cd0bb239a4fd02e7acbcb797ecccfb0e3cb (patch) | |
| tree | 516e21bdfb3255a62b0317f3499d486003493dcc /debian | |
| parent | 12eb2e1c8ed540eafc4a9590b12af5721469727e (diff) | |
| download | debhelper-6c946cd0bb239a4fd02e7acbcb797ecccfb0e3cb.tar.gz | |
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@thykier.net>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 0eb991e4..3f281669 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@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 |