summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/control8
2 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 2c137c99b..ae8f5c984 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ openssh (1:6.1p1-2) UNRELEASED; urgency=low
4 * Merge from Ubuntu: 4 * Merge from Ubuntu:
5 - Add support for registering ConsoleKit sessions on login. (This is 5 - Add support for registering ConsoleKit sessions on login. (This is
6 currently enabled only when building for Ubuntu.) 6 currently enabled only when building for Ubuntu.)
7 - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's
8 been long enough since the relevant vulnerability that we shouldn't
9 need these installed by default nowadays.
7 10
8 -- Colin Watson <cjwatson@debian.org> Fri, 28 Sep 2012 17:54:42 +0100 11 -- Colin Watson <cjwatson@debian.org> Fri, 28 Sep 2012 17:54:42 +0100
9 12
diff --git a/debian/control b/debian/control
index 1105b0699..c4182d981 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,10 @@ Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-ssh/openssh/trunk
12Package: openssh-client 12Package: openssh-client
13Architecture: any 13Architecture: any
14Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd 14Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
15Recommends: xauth, openssh-blacklist, openssh-blacklist-extra 15Recommends: xauth
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, monkeysphere 18Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere, openssh-blacklist, openssh-blacklist-extra
19Provides: rsh-client, ssh-client 19Provides: rsh-client, ssh-client
20Multi-Arch: foreign 20Multi-Arch: foreign
21Description: secure shell (SSH) client, for secure access to remote machines 21Description: secure shell (SSH) client, for secure access to remote machines
@@ -45,10 +45,10 @@ Package: openssh-server
45Priority: optional 45Priority: optional
46Architecture: any 46Architecture: any
47Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), procps 47Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), procps
48Recommends: xauth, ncurses-term, openssh-blacklist, openssh-blacklist-extra, ${openssh-server:Recommends} 48Recommends: xauth, ncurses-term, ${openssh-server:Recommends}
49Conflicts: 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) 49Conflicts: 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)
50Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 50Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
51Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere 51Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere, openssh-blacklist, openssh-blacklist-extra
52Provides: ssh-server 52Provides: ssh-server
53Multi-Arch: foreign 53Multi-Arch: foreign
54Description: secure shell (SSH) server, for secure access from remote machines 54Description: secure shell (SSH) server, for secure access from remote machines