4 files changed, 7 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 07a85e2ca..5e19b59fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ openssh (1:6.6p1-8) UNRELEASED; urgency=medium
   * Show fingerprints of new keys after creating them in the postinst
     (closes: #762128).
   * Policy version 3.9.6: no changes required.
+  * Don't link /usr/share/doc/ssh to openssh-client, as this is not safe
+    between Architecture: all and Architecture: any binary packages (closes:
+    #763375).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 13 Aug 2014 00:59:23 +0100
 
diff --git a/debian/control b/debian/control
index 3fe3a4ad3..cbc767cc0 100644
--- a/debian/control
+++ b/debian/control
@@ -101,6 +101,7 @@ Description: secure shell (SSH) sftp server module, for SFTP access from remote
 Package: ssh
 Priority: extra
 Architecture: all
+Pre-Depends: dpkg (>= 1.17.5)
 Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
 Description: secure shell client and server (metapackage)
  This metapackage is a convenient way to install both the OpenSSH client
diff --git a/debian/rules b/debian/rules
index efd9ee74a..d35c7d48e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,8 +175,8 @@ override_dh_install:
                 debian/openssh-client/etc/ssh/ssh_config
 
 override_dh_installdocs:
-        dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -Nssh
-        dh_installdocs -popenssh-server -popenssh-sftp-server -pssh \
+        dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
+        dh_installdocs -popenssh-server -popenssh-sftp-server \
                 --link-doc=openssh-client
         # Avoid breaking dh_installexamples later.
         mkdir -p debian/openssh-server/usr/share/doc/openssh-client
diff --git a/debian/ssh.maintscript b/debian/ssh.maintscript
new file mode 100644
index 000000000..efd370e25
--- /dev/null
+++ b/debian/ssh.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/ssh /usr/share/doc/openssh-client 1:6.6p1-8~