summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2017-06-28 13:47:06 +0000
committerNiels Thykier <niels@thykier.net>2017-06-28 13:47:06 +0000
commit4c063c99c3c2967491a6e465d0abc9e0762197b4 (patch)
tree917c71097e148080b8279d8def594f70a7c59bd4
parent532ed1b63d093f7dec8b49341c04a1f5d6bbd9d0 (diff)
downloaddebhelper-4c063c99c3c2967491a6e465d0abc9e0762197b4.tar.gz
dh_installman: Fix regression in compat 5
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog2
-rwxr-xr-xdh_installman2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index eb2d22a1..849ecafe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ debhelper (10.6) UNRELEASED; urgency=medium
Note that dh_installdocs is not a complete noop in this case
as it still ensures the package has a copyright file (or a
symlinked doc directory). (Closes: #865869)
+ * dh_installman: Fix regression in compat 5 that could make it
+ ignore one manpage per invocation.
-- Niels Thykier <niels@thykier.net> Tue, 27 Jun 2017 17:29:32 +0000
diff --git a/dh_installman b/dh_installman
index 17c7633c..f1ad517f 100755
--- a/dh_installman
+++ b/dh_installman
@@ -208,7 +208,7 @@ on_items_in_parallel(\@all_packages, sub {
my $instpage = "$destdir$instname.$section";
next if -l $instpage;
- next if compat(5) && -e _;
+ next if -e _ && compat(5);
install_dir($destdir);
if ($gz) {