summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2018-01-24 19:58:40 +0000
committerNiels Thykier <niels@thykier.net>2018-01-24 19:58:40 +0000
commit75518fac07c402443d76deebf84730bf47ca5684 (patch)
tree017b535b51088a5cc98c55760fe5e2d501495022 /debian
parent7b0fadbc6cc9f938116b2da5ed0e440edaeb49e4 (diff)
downloaddebhelper-75518fac07c402443d76deebf84730bf47ca5684.tar.gz
dh_installdocs: Make -A neuter main-doc package auto-detection
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1a628fad..63d449db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debhelper (11.1.4) UNRELEASED; urgency=medium
* qmake.pm/qmake4.pm: Avoid global state in the build systems.
* dh_makeshlibs: Fix --no-act, which could still cause writes
to the shlibs file. Thanks to Sven Joachim for reporting it.
+ * dh_installdocs: Discard auto-detected main doc package when
+ passed -A/--all as it causes file-conflicts.
+ (Closes: #886108, #888294)
-- Niels Thykier <niels@thykier.net> Sun, 21 Jan 2018 08:18:20 +0000