From 3f5e93791ca53dd03b669f57ce29a08f9c241f34 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 24 Nov 2015 17:39:37 +0000 Subject: Fix dh_install and dh_fixperms overrides to work properly with an architecture-independent-only build (closes: #806090). --- debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 198e2b616..d6b1b101a 100755 --- a/debian/rules +++ b/debian/rules @@ -173,7 +173,7 @@ endif override_dh_auto_install: $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys -override_dh_install: +override_dh_install-arch: rm -f debian/tmp/etc/ssh/sshd_config dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing @@ -186,6 +186,10 @@ override_dh_install: debian/openssh-client/etc/ssh/moduli \ debian/openssh-client/etc/ssh/ssh_config +override_dh_install-indep: + rm -f debian/tmp/etc/ssh/sshd_config + dh_install --fail-missing + override_dh_installdocs: dh_installdocs -Nopenssh-server -Nopenssh-sftp-server dh_installdocs -popenssh-server -popenssh-sftp-server \ @@ -210,7 +214,7 @@ endif override_dh_installpam: debian/openssh-server.sshd.pam dh_installpam --name sshd -override_dh_fixperms: +override_dh_fixperms-arch: dh_fixperms chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign -- cgit v1.2.3