2 files changed, 20 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 2589a2278..3038df6ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openssh (1:6.9p1-3) UNRELEASED; urgency=medium
     (closes: #799271).
   * Fix dh_install and dh_fixperms overrides to work properly with an
     architecture-independent-only build (closes: #806090).
+  * Do much less work in architecture-independent-only builds.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 17 Sep 2015 13:52:53 +0100
 
diff --git a/debian/rules b/debian/rules
index d6b1b101a..148eed209 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,14 +127,18 @@ autoreconf:
         autoreconf -f -i
         cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
 
-override_dh_autoreconf:
+override_dh_autoreconf-arch:
         dh_autoreconf debian/rules -- autoreconf
 
-override_dh_auto_configure:
+override_dh_autoreconf-indep:
+
+override_dh_auto_configure-arch:
         dh_auto_configure -Bbuild-deb -- $(confflags)
         dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
 
-override_dh_auto_build:
+override_dh_auto_configure-indep:
+
+override_dh_auto_build-arch:
         # Avoid libnsl linkage. Ugh.
         perl -pi -e 's/ +-lnsl//' build-udeb/config.status
         cd build-udeb && ./config.status
@@ -144,7 +148,9 @@ override_dh_auto_build:
 
         $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
 
-override_dh_auto_test:
+override_dh_auto_build-indep:
+
+override_dh_auto_test-arch:
 ifeq ($(RUN_TESTS),yes)
         $(MAKE) -C build-deb regress-prep
         $(MAKE) -C build-deb $(PARALLEL) \
@@ -161,6 +167,8 @@ ifeq ($(RUN_TESTS),yes)
         $(MAKE) -C debian/keygen-test
 endif
 
+override_dh_auto_test-indep:
+
 override_dh_auto_clean:
         rm -rf build-deb build-udeb
 ifeq ($(RUN_TESTS),yes)
@@ -170,9 +178,11 @@ endif
         (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
                 > debian/copyright
 
-override_dh_auto_install:
+override_dh_auto_install-arch:
         $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
 
+override_dh_auto_install-indep:
+
 override_dh_install-arch:
         rm -f debian/tmp/etc/ssh/sshd_config
 
@@ -186,9 +196,12 @@ override_dh_install-arch:
                 debian/openssh-client/etc/ssh/moduli \
                 debian/openssh-client/etc/ssh/ssh_config
 
+# We'd like to use dh_install --fail-missing here, but that doesn't work
+# well in combination with dh-exec: it complains that files generated by
+# dh-exec for architecture-dependent packages aren't installed.
 override_dh_install-indep:
         rm -f debian/tmp/etc/ssh/sshd_config
-        dh_install --fail-missing
+        dh_install
 
 override_dh_installdocs:
         dh_installdocs -Nopenssh-server -Nopenssh-sftp-server