8 files changed, 56 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 0a7a28377..4c81d1486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:4.1p1-5) UNRELEASED; urgency=low
 
   * Build-depend on libselinux1-dev on ppc64 too (closes: #314625).
   * Drop priority of ssh to extra to match the override file.
+  * Make /usr/share/doc/openssh-server and /usr/share/doc/ssh symlinks to
+    /usr/share/doc/openssh-client.
   * debconf template translations:
     - Update Brazilian Portuguese (thanks, André Luís Lopes;
       closes: #315477).
diff --git a/debian/openssh-server.links b/debian/openssh-server.links
index 2d98b1dcb..d9bb08420 100644
--- a/debian/openssh-server.links
+++ b/debian/openssh-server.links
@@ -1 +1,2 @@
 usr/lib/openssh/sftp-server usr/lib/sftp-server
+usr/share/doc/openssh-client usr/share/doc/openssh-server
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index e6fe65ffa..cf30a181c 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -14,6 +14,14 @@ if [ "$action" != configure ]
 fi
 
 
+fix_doc_symlink() {
+        if [ ! -L /usr/share/doc/openssh-server ] && \
+           dpkg --compare-versions "$oldversion" lt-nl 1:4.1p1-5; then
+                rm -rf /usr/share/doc/openssh-server
+                ln -s openssh-client /usr/share/doc/openssh-server
+        fi
+}
+
 check_idea_key() {
     #check for old host_key files using IDEA, which openssh does not support
         if [ -f /etc/ssh/ssh_host_key ] ; then
@@ -302,6 +310,7 @@ setup_init() {
 }
 
 
+fix_doc_symlink
 create_sshdconfig
 check_idea_key
 create_keys
diff --git a/debian/openssh-server.prerm b/debian/openssh-server.prerm
index 7bc080b9d..9c3313aac 100644
--- a/debian/openssh-server.prerm
+++ b/debian/openssh-server.prerm
@@ -26,6 +26,11 @@ case "$1" in
         fi
         ;;
     upgrade)
+        # remove symlink on downgrade to when it was a directory
+        if [ -L /usr/share/doc/openssh-server ] && \
+           dpkg --compare-versions "$2" lt-nl 1:4.1p1-5; then
+                rm -f /usr/share/doc/openssh-server
+        fi
         ;;
     failed-upgrade)
         ;;
diff --git a/debian/rules b/debian/rules
index f5365c022..2f5c83c1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -206,8 +206,9 @@ ifeq ($(PO2DEBCONF),yes)
         po2debconf -e utf8 debian/openssh-server.templates.master > debian/openssh-server.templates
 endif
         dh_installdebconf
-        dh_installdocs OVERVIEW README
-        cat debian/copyright.head LICENCE > debian/openssh-server/usr/share/doc/openssh-server/copyright
+        dh_installdocs
+        mv debian/openssh-server/usr/share/doc/openssh-server debian/openssh-server/usr/share/doc/openssh-client
+        rm -f debian/openssh-server/usr/share/doc/openssh-client/copyright
 ifeq ($(PAMSUBST),yes)
         # Clean up if we've done this already, to ensure idempotency.
         if [ -f debian/openssh-server.ssh.pam.new-style ]; then \
@@ -221,7 +222,6 @@ ifeq ($(PAMSUBST),yes)
             debian/openssh-server.ssh.pam.new-style > debian/openssh-server.ssh.pam
 endif
         dh_installpam --name ssh # TODO: breaks woody backports
-        dh_installchangelogs ChangeLog
         dh_link
         dh_strip
         dh_compress
@@ -238,8 +238,9 @@ binary-ssh: build install
         dh_testdir
         dh_testroot
         dh_installdocs
-        cat debian/copyright.head LICENCE > debian/ssh/usr/share/doc/ssh/copyright
-        dh_installchangelogs
+        mv debian/ssh/usr/share/doc/ssh debian/ssh/usr/share/doc/openssh-client
+        rm -f debian/ssh/usr/share/doc/openssh-client/copyright
+        dh_link
         dh_compress
         dh_fixperms
         dh_installdeb
diff --git a/debian/ssh.links b/debian/ssh.links
new file mode 100644
index 000000000..bc454b326
--- /dev/null
+++ b/debian/ssh.links
@@ -0,0 +1 @@
+usr/share/doc/openssh-client usr/share/doc/ssh
diff --git a/debian/ssh.postinst b/debian/ssh.postinst
new file mode 100644
index 000000000..cb1278033
--- /dev/null
+++ b/debian/ssh.postinst
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+action="$1"
+oldversion="$2"
+
+if [ "$action" != configure ]; then
+        exit 0
+fi
+
+if [ ! -L /usr/share/doc/ssh ] && \
+   dpkg --compare-versions "$oldversion" lt-nl 1:4.1p1-5; then
+        rm -rf /usr/share/doc/ssh
+        ln -s openssh-client /usr/share/doc/ssh
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/ssh.prerm b/debian/ssh.prerm
new file mode 100644
index 000000000..400c92bed
--- /dev/null
+++ b/debian/ssh.prerm
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+case $1 in
+        upgrade)
+                if [ -L /usr/share/doc/ssh ] && \
+                   dpkg --compare-versions "$2" lt-nl 1:4.1p1-5; then
+                        rm -f /usr/share/doc/ssh
+                fi
+                ;;
+esac
+
+#DEBHELPER#
+
+exit 0