summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2021-12-29 01:06:07 +0000
committerColin Watson <cjwatson@debian.org>2021-12-29 01:06:07 +0000
commitfd74b1053a0cbe188d2f46ec3830c01f69b9f16b (patch)
tree7f2534afabe4897df8f3a17a775bde4cbd11036a
parent6575c90a6ba442634f55947bc84c998c3fb2b4fe (diff)
Simplify some debhelper overrides slightly
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules6
2 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 0684a787c..8ad5dc557 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ openssh (1:8.7p1-3) UNRELEASED; urgency=medium
* Make the sysvinit script provide "ssh" as well as "sshd".
* Set Rules-Requires-Root: no.
* Use dh_installalternatives.
+ * Simplify some debhelper overrides slightly.
-- Colin Watson <cjwatson@debian.org> Tue, 28 Dec 2021 18:02:27 +0000
diff --git a/debian/rules b/debian/rules
index dda719c0c..c43b980d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -208,13 +208,11 @@ override_dh_installpam: debian/openssh-server.sshd.pam
override_dh_runit:
dh_runit -popenssh-server
-override_dh_fixperms-arch:
- dh_fixperms
+execute_after_dh_fixperms-arch:
chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign
# Tighten libssl dependencies to match the check in entropy.c.
-override_dh_shlibdeps:
- dh_shlibdeps
+execute_after_dh_shlibdeps:
debian/adjust-openssl-dependencies
override_dh_gencontrol: