summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules8
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1ff63e114..2589a2278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:6.9p1-3) UNRELEASED; urgency=medium
2 2
3 * ssh_config(5): Fix markup errors in description of GSSAPITrustDns 3 * ssh_config(5): Fix markup errors in description of GSSAPITrustDns
4 (closes: #799271). 4 (closes: #799271).
5 * Fix dh_install and dh_fixperms overrides to work properly with an
6 architecture-independent-only build (closes: #806090).
5 7
6 -- Colin Watson <cjwatson@debian.org> Thu, 17 Sep 2015 13:52:53 +0100 8 -- Colin Watson <cjwatson@debian.org> Thu, 17 Sep 2015 13:52:53 +0100
7 9
diff --git a/debian/rules b/debian/rules
index 198e2b616..d6b1b101a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,7 +173,7 @@ endif
173override_dh_auto_install: 173override_dh_auto_install:
174 $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys 174 $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
175 175
176override_dh_install: 176override_dh_install-arch:
177 rm -f debian/tmp/etc/ssh/sshd_config 177 rm -f debian/tmp/etc/ssh/sshd_config
178 178
179 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing 179 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
@@ -186,6 +186,10 @@ override_dh_install:
186 debian/openssh-client/etc/ssh/moduli \ 186 debian/openssh-client/etc/ssh/moduli \
187 debian/openssh-client/etc/ssh/ssh_config 187 debian/openssh-client/etc/ssh/ssh_config
188 188
189override_dh_install-indep:
190 rm -f debian/tmp/etc/ssh/sshd_config
191 dh_install --fail-missing
192
189override_dh_installdocs: 193override_dh_installdocs:
190 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server 194 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
191 dh_installdocs -popenssh-server -popenssh-sftp-server \ 195 dh_installdocs -popenssh-server -popenssh-sftp-server \
@@ -210,7 +214,7 @@ endif
210override_dh_installpam: debian/openssh-server.sshd.pam 214override_dh_installpam: debian/openssh-server.sshd.pam
211 dh_installpam --name sshd 215 dh_installpam --name sshd
212 216
213override_dh_fixperms: 217override_dh_fixperms-arch:
214 dh_fixperms 218 dh_fixperms
215 chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign 219 chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign
216 220