summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-07-28 11:58:44 +0100
committerColin Watson <cjwatson@debian.org>2011-07-28 11:58:44 +0100
commitb231e29fdc2c76309619e2fbc45e5779df4fe147 (patch)
tree5ce596bc04bd7035f695ecf2b5d9e6d9a83b4a47
parentc6262699b663f082e4224a65ca5ed8e6e518a21c (diff)
openssh-client and openssh-server Suggests: monkeysphere.
-rw-r--r--debian/changelog6
-rw-r--r--debian/control4
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 88f7e12a8..8d48ee108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1openssh (1:5.8p1-6) UNRELEASED; urgency=low
2
3 * openssh-client and openssh-server Suggests: monkeysphere.
4
5 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2011 11:57:27 +0100
6
1openssh (1:5.8p1-5) unstable; urgency=low 7openssh (1:5.8p1-5) unstable; urgency=low
2 8
3 * Drop openssh-server's dependency on openssh-blacklist to a 9 * Drop openssh-server's dependency on openssh-blacklist to a
diff --git a/debian/control b/debian/control
index 8ecdd615e..63bf2df87 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, a
15Recommends: xauth, openssh-blacklist, openssh-blacklist-extra 15Recommends: xauth, openssh-blacklist, openssh-blacklist-extra
16Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 16Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
17Replaces: ssh, ssh-krb5 17Replaces: ssh, ssh-krb5
18Suggests: ssh-askpass, libpam-ssh, keychain 18Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere
19Provides: rsh-client, ssh-client 19Provides: rsh-client, ssh-client
20Description: secure shell (SSH) client, for secure access to remote machines 20Description: secure shell (SSH) client, for secure access to remote machines
21 This is the portable version of OpenSSH, a free implementation of 21 This is the portable version of OpenSSH, a free implementation of
@@ -47,7 +47,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, l
47Recommends: xauth, openssh-blacklist, openssh-blacklist-extra 47Recommends: xauth, openssh-blacklist, openssh-blacklist-extra
48Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 48Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
49Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 49Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
50Suggests: ssh-askpass, rssh, molly-guard, ufw 50Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere
51Provides: ssh-server 51Provides: ssh-server
52Description: secure shell (SSH) server, for secure access from remote machines 52Description: secure shell (SSH) server, for secure access from remote machines
53 This is the portable version of OpenSSH, a free implementation of 53 This is the portable version of OpenSSH, a free implementation of