diff options
author | Colin Watson <cjwatson@debian.org> | 2015-11-24 17:39:37 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-11-24 17:39:37 +0000 |
commit | 3f5e93791ca53dd03b669f57ce29a08f9c241f34 (patch) | |
tree | 0967dda1e28e0f1e23cf828f4ea163ef7033a9b0 /debian/rules | |
parent | 748bb595047d10166322e716d3a760d2b055ba66 (diff) |
Fix dh_install and dh_fixperms overrides to work properly with an architecture-independent-only build (closes: #806090).
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 198e2b616..d6b1b101a 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -173,7 +173,7 @@ endif | |||
173 | override_dh_auto_install: | 173 | override_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 | ||
176 | override_dh_install: | 176 | override_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 | ||
189 | override_dh_install-indep: | ||
190 | rm -f debian/tmp/etc/ssh/sshd_config | ||
191 | dh_install --fail-missing | ||
192 | |||
189 | override_dh_installdocs: | 193 | override_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 | |||
210 | override_dh_installpam: debian/openssh-server.sshd.pam | 214 | override_dh_installpam: debian/openssh-server.sshd.pam |
211 | dh_installpam --name sshd | 215 | dh_installpam --name sshd |
212 | 216 | ||
213 | override_dh_fixperms: | 217 | override_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 | ||