9 files changed, 22 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 84eef3ea6..9ae2a48d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:6.6p1-7) UNRELEASED; urgency=medium
 
   * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
     directly.
+  * Use dh-exec to simplify override_dh_install target.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 20 Jul 2014 21:42:58 +0100
 
diff --git a/debian/control b/debian/control
index 0ee91e6fa..7e7a64b5d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4)
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4)
 Standards-Version: 3.9.5
 Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
 Homepage: http://www.openssh.org/
diff --git a/debian/openssh-client.dirs b/debian/openssh-client.dirs
deleted file mode 100644
index bbe54c691..000000000
--- a/debian/openssh-client.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/apport/package-hooks
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index 6a8060000..18e529f64 100644..100755
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -1,3 +1,5 @@
+#! /usr/bin/dh-exec
+
 etc/ssh/moduli
 etc/ssh/ssh_config
 usr/bin/scp
@@ -25,3 +27,11 @@ usr/share/man/man8/ssh-pkcs11-helper.8
 
 contrib/ssh-copy-id usr/bin
 debian/ssh-argv0 usr/bin
+
+# dh_apport would be neater, but at the time of writing it isn't in unstable
+# yet.
+debian/openssh-client.apport => usr/share/apport/package-hooks/openssh-client.py
+
+# Upstart user job (only used under user sessions).
+debian/ssh-agent.user-session.upstart => usr/share/upstart/sessions/ssh-agent.conf
+
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs
index 7a3743680..859d1a393 100644
--- a/debian/openssh-server.dirs
+++ b/debian/openssh-server.dirs
@@ -1,9 +1,6 @@
 etc/init.d
 etc/default
-etc/network/if-up.d
-etc/ufw/applications.d
 usr/lib/openssh
 usr/sbin
-usr/share/apport/package-hooks
 usr/share/man/man5
 usr/share/man/man8
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index 149222dad..06e0c71b7 100644..100755
--- a/debian/openssh-server.install
+++ b/debian/openssh-server.install
@@ -1,8 +1,16 @@
+#! /usr/bin/dh-exec
+
 usr/sbin/sshd
 usr/share/man/man5/authorized_keys.5
 usr/share/man/man5/sshd_config.5
 usr/share/man/man8/sshd.8
 
+debian/openssh-server.if-up => etc/network/if-up.d/openssh-server
+debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server
 debian/systemd/ssh.socket lib/systemd/system
 debian/systemd/ssh@.service lib/systemd/system
 debian/systemd/sshd.conf usr/lib/tmpfiles.d
+
+# dh_apport would be neater, but at the time of writing it isn't in unstable
+# yet.
+debian/openssh-server.apport => usr/share/apport/package-hooks/openssh-server.py
diff --git a/debian/rules b/debian/rules
index 3419366c3..efd9ee74a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -168,25 +168,12 @@ override_dh_install:
         dh_install -popenssh-client-udeb -popenssh-server-udeb \
                 --sourcedir=build-udeb
 
-        install -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass
-
-        install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server
-        install -o root -g root -m 644 debian/openssh-server.ufw.profile debian/openssh-server/etc/ufw/applications.d/openssh-server
-
         # Remove version control tags to avoid unnecessary conffile
         # resolution steps for administrators.
         sed -i '/\$$OpenBSD:/d' \
                 debian/openssh-client/etc/ssh/moduli \
                 debian/openssh-client/etc/ssh/ssh_config
 
-        # dh_apport would be neater, but at the time of writing it isn't in
-        # unstable yet.
-        install -p -m 644 debian/openssh-client.apport debian/openssh-client/usr/share/apport/package-hooks/openssh-client.py
-        install -p -m 644 debian/openssh-server.apport debian/openssh-server/usr/share/apport/package-hooks/openssh-server.py
-
-        # Upstart user job (only used under user sessions)
-        install -p -m 644 -D debian/ssh-agent.user-session.upstart debian/openssh-client/usr/share/upstart/sessions/ssh-agent.conf
-
 override_dh_installdocs:
         dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -Nssh
         dh_installdocs -popenssh-server -popenssh-sftp-server -pssh \
diff --git a/debian/ssh-askpass-gnome.dirs b/debian/ssh-askpass-gnome.dirs
index 0ffa45024..fcf16f2d6 100644
--- a/debian/ssh-askpass-gnome.dirs
+++ b/debian/ssh-askpass-gnome.dirs
@@ -1,3 +1 @@
-usr/lib/openssh
 usr/share/man/man1
-usr/share/pixmaps
diff --git a/debian/ssh-askpass-gnome.install b/debian/ssh-askpass-gnome.install
index 8b6b5f045..9b0a8fd8d 100644..100755
--- a/debian/ssh-askpass-gnome.install
+++ b/debian/ssh-askpass-gnome.install
@@ -1 +1,3 @@
+#! /usr/bin/dh-exec
+contrib/gnome-ssh-askpass2 => usr/lib/openssh/gnome-ssh-askpass
 debian/ssh-askpass-gnome.png usr/share/pixmaps