summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules4
-rw-r--r--debian/ssh.maintscript1
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
5 * Show fingerprints of new keys after creating them in the postinst 5 * Show fingerprints of new keys after creating them in the postinst
6 (closes: #762128). 6 (closes: #762128).
7 * Policy version 3.9.6: no changes required. 7 * Policy version 3.9.6: no changes required.
8 * Don't link /usr/share/doc/ssh to openssh-client, as this is not safe
9 between Architecture: all and Architecture: any binary packages (closes:
10 #763375).
8 11
9 -- Colin Watson <cjwatson@debian.org> Wed, 13 Aug 2014 00:59:23 +0100 12 -- Colin Watson <cjwatson@debian.org> Wed, 13 Aug 2014 00:59:23 +0100
10 13
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
101Package: ssh 101Package: ssh
102Priority: extra 102Priority: extra
103Architecture: all 103Architecture: all
104Pre-Depends: dpkg (>= 1.17.5)
104Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version}) 105Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
105Description: secure shell client and server (metapackage) 106Description: secure shell client and server (metapackage)
106 This metapackage is a convenient way to install both the OpenSSH client 107 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:
175 debian/openssh-client/etc/ssh/ssh_config 175 debian/openssh-client/etc/ssh/ssh_config
176 176
177override_dh_installdocs: 177override_dh_installdocs:
178 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -Nssh 178 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
179 dh_installdocs -popenssh-server -popenssh-sftp-server -pssh \ 179 dh_installdocs -popenssh-server -popenssh-sftp-server \
180 --link-doc=openssh-client 180 --link-doc=openssh-client
181 # Avoid breaking dh_installexamples later. 181 # Avoid breaking dh_installexamples later.
182 mkdir -p debian/openssh-server/usr/share/doc/openssh-client 182 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~