diff options
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/debian/control b/debian/control index adfeca226..0f77b73db 100644 --- a/debian/control +++ b/debian/control | |||
@@ -9,8 +9,8 @@ Uploaders: Colin Watson <cjwatson@debian.org> | |||
9 | Package: openssh-client | 9 | Package: openssh-client |
10 | Architecture: any | 10 | Architecture: any |
11 | Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd | 11 | Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd |
12 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 | 12 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) |
13 | Replaces: ssh (<< 1:3.8.1p1-9), ssh-krb5 | 13 | Replaces: ssh (<< 1:3.8.1p1-9), ssh-krb5 (<< 1:4.3p2-7) |
14 | Suggests: ssh-askpass, xbase-clients | 14 | Suggests: ssh-askpass, xbase-clients |
15 | Provides: rsh-client, ssh-client | 15 | Provides: rsh-client, ssh-client |
16 | Description: Secure shell client, an rlogin/rsh/rcp replacement | 16 | Description: Secure shell client, an rlogin/rsh/rcp replacement |
@@ -39,8 +39,8 @@ Package: openssh-server | |||
39 | Priority: optional | 39 | Priority: optional |
40 | Architecture: any | 40 | Architecture: any |
41 | Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) | 41 | Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) |
42 | Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 | 42 | Conflicts: 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) |
43 | Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | 43 | Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5 (<< 1:4.3p2-7) |
44 | Suggests: ssh-askpass, xbase-clients, rssh, molly-guard | 44 | Suggests: ssh-askpass, xbase-clients, rssh, molly-guard |
45 | Provides: ssh-server | 45 | Provides: ssh-server |
46 | Description: Secure shell server, an rshd replacement | 46 | Description: Secure shell server, an rshd replacement |
@@ -72,6 +72,16 @@ Description: Secure shell client and server (transitional package) | |||
72 | the OpenSSH server, which are now in separate packages. You may remove | 72 | the OpenSSH server, which are now in separate packages. You may remove |
73 | it once the upgrade is complete and nothing depends on it. | 73 | it once the upgrade is complete and nothing depends on it. |
74 | 74 | ||
75 | Package: ssh-krb5 | ||
76 | Priority: extra | ||
77 | Architecture: all | ||
78 | Depends: openssh-client, openssh-server | ||
79 | Description: Secure shell client and server (transitional package) | ||
80 | This is a transitional package depending on the regular Debian OpenSSH | ||
81 | client and server, which now support GSSAPI natively. It will add the | ||
82 | necessary GSSAPI options to the server configuration file. You can | ||
83 | remove it once the upgrade is complete and nothing depends on it. | ||
84 | |||
75 | Package: ssh-askpass-gnome | 85 | Package: ssh-askpass-gnome |
76 | Section: gnome | 86 | Section: gnome |
77 | Priority: optional | 87 | Priority: optional |