Use dh_install more effectively.

6 files changed, 45 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 56c3b5bbe..e271bb5a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openssh (1:5.4p1-2) UNRELEASED; urgency=low
     verification (closes: #572049).
   * Convert to dh(1), and use dh_installdocs --link-doc.
   * Drop lpia support, since Ubuntu no longer supports this architecture.
+  * Use dh_install more effectively.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 06 Apr 2010 23:16:39 +0100
 
diff --git a/debian/openssh-client-udeb.install b/debian/openssh-client-udeb.install
new file mode 100644
index 000000000..b3891f02d
--- /dev/null
+++ b/debian/openssh-client-udeb.install
@@ -0,0 +1,3 @@
+scp usr/bin
+sftp usr/bin
+ssh usr/bin
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index aadaaf288..fd9e8feab 100644
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -1,2 +1,29 @@
+etc/ssh/moduli
+etc/ssh/ssh_config
+usr/bin/scp
+usr/bin/sftp
+usr/bin/slogin
+usr/bin/ssh
+usr/bin/ssh-add
+usr/bin/ssh-agent
+usr/bin/ssh-keygen
+usr/bin/ssh-keyscan
+usr/bin/ssh-vulnkey
+usr/lib/openssh/ssh-keysign
+usr/lib/openssh/ssh-pkcs11-helper
+usr/share/man/man1/scp.1
+usr/share/man/man1/sftp.1
+usr/share/man/man1/slogin.1
+usr/share/man/man1/ssh-add.1
+usr/share/man/man1/ssh-agent.1
+usr/share/man/man1/ssh-keygen.1
+usr/share/man/man1/ssh-keyscan.1
+usr/share/man/man1/ssh-vulnkey.1
+usr/share/man/man1/ssh.1
+usr/share/man/man5/moduli.5
+usr/share/man/man5/ssh_config.5
+usr/share/man/man8/ssh-keysign.8
+usr/share/man/man8/ssh-pkcs11-helper.8
+
 contrib/ssh-copy-id usr/bin
 debian/ssh-argv0 usr/bin
diff --git a/debian/openssh-server-udeb.install b/debian/openssh-server-udeb.install
new file mode 100644
index 000000000..05ccbf7af
--- /dev/null
+++ b/debian/openssh-server-udeb.install
@@ -0,0 +1,2 @@
+sshd usr/sbin
+ssh-keygen usr/bin
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
new file mode 100644
index 000000000..8e04c4170
--- /dev/null
+++ b/debian/openssh-server.install
@@ -0,0 +1,6 @@
+usr/lib/openssh/sftp-server
+usr/sbin/sshd
+usr/share/man/man5/authorized_keys.5
+usr/share/man/man5/sshd_config.5
+usr/share/man/man8/sftp-server.8
+usr/share/man/man8/sshd.8
diff --git a/debian/rules b/debian/rules
index f2c24ddf9..85b916bd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,30 +151,20 @@ endif
                 > debian/copyright
 
 override_dh_auto_install:
-        $(MAKE) -C build-deb DESTDIR=`pwd`/debian/openssh-client install-nokeys
+        $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
 
-        rm -f debian/openssh-client/etc/ssh/sshd_config
+override_dh_install:
+        rm -f debian/tmp/etc/ssh/sshd_config
 
-        # Split off the server.
-        mv debian/openssh-client/usr/sbin/sshd debian/openssh-server/usr/sbin/
-        mv debian/openssh-client/usr/lib/openssh/sftp-server debian/openssh-server/usr/lib/openssh/
-        mv debian/openssh-client/usr/share/man/man5/authorized_keys.5 debian/openssh-server/usr/share/man/man5/
-        mv debian/openssh-client/usr/share/man/man5/sshd_config.5 debian/openssh-server/usr/share/man/man5/
-        mv debian/openssh-client/usr/share/man/man8/sshd.8 debian/openssh-server/usr/share/man/man8/
-        mv debian/openssh-client/usr/share/man/man8/sftp-server.8 debian/openssh-server/usr/share/man/man8/
-        rmdir debian/openssh-client/usr/sbin debian/openssh-client/var/run/sshd
+        dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
+        dh_install -popenssh-client-udeb -popenssh-server-udeb \
+                --sourcedir=build-udeb
 
         install -s -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
 
-        install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh
-        install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp
-        install -m 755 build-udeb/sftp debian/openssh-client-udeb/usr/bin/sftp
-        install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd
-        install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen
-
         # Remove version control tags to avoid unnecessary conffile
         # resolution steps for administrators.
         sed -i '/\$$OpenBSD:/d' \