summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2018-05-10 07:13:59 +0000
committerNiels Thykier <niels@thykier.net>2018-05-10 07:13:59 +0000
commit439fd0aaa68c9de747b5abb395b8c5c620c91df7 (patch)
tree4969f6bf418f59950975bbe63d2bd0b952969772
parentf51eec1ec890eacf624333227505fdb38f4375db (diff)
downloaddebhelper-439fd0aaa68c9de747b5abb395b8c5c620c91df7.tar.gz
Revert "dh_installman: Handle .so plus target both being compressed"
This reverts commit f51eec1ec890eacf624333227505fdb38f4375db.
-rw-r--r--debian/changelog5
-rwxr-xr-xdh_installman13
2 files changed, 3 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog
index 089272f3..26fcc1c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,11 +22,6 @@ debhelper (11.3) UNRELEASED; urgency=medium
defaults to --list-missing in compat 12. Thanks to
Robie Basak for spotting the contradicting documentation.
(Closes: #898161)
- * dh_installman: If both the .so and the target manpage are
- compressed, then generate the link as compressed. This
- prevents dh_compress from adding another ".gz" extension
- to the link. Thanks to Andreas Hasenack for reporting
- the bug. Partly fixes LP: #1765851.
[ Dmitry Shachnev ]
* qmake.pm: Use ${DEB_HOST_GNU_TYPE}-qmake wrapper for
diff --git a/dh_installman b/dh_installman
index 27507425..6879abac 100755
--- a/dh_installman
+++ b/dh_installman
@@ -351,17 +351,10 @@ sub find_so_man {
elsif ($solink =~ m!/!) {
$solink="../$solink";
}
- my $target;
- if ( -e $solink) {
- $target = $solink;
- } elsif (-e "${solink}.gz") {
- $target = "${solink}.gz";
- }
-
- if (defined($target)) {
- push(@sofiles,"$File::Find::dir/$_");
- push(@sodests, $target);
+ if (-e $solink || -e "$solink.gz") {
+ push @sofiles,"$File::Find::dir/$_";
+ push @sodests,$solink;
}
}
}