diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 12:37:56 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 12:37:56 +0000 |
commit | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (patch) | |
tree | 732dcec3c78e0f4a044676da7008c6f29ab33fc1 /debian/control | |
parent | 644a27682f0f6d7c252561941efb684ac5f6905c (diff) | |
parent | ebc4a8cca5c11a314af816af146fe70ed4c7598e (diff) |
Merge from branch-V_3_8_1_P1-4-client-server-split:
cvs up -jV_3_8_1_P1-8 -jbranch-V_3_8_1_P1-4-client-server-split
branch-V_3_8_1_P1-4-client-server-split is now closed. For further
development for sarge (Debian version 3.8.1p1-8.sarge.4, CVS tag
V_3_8_1_P1-8_sarge_4), use branch-V_3_8_1_P1-8_sarge_4-sarge.
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 52 |
1 files changed, 45 insertions, 7 deletions
diff --git a/debian/control b/debian/control index 37899eb3c..9296e079f 100644 --- a/debian/control +++ b/debian/control | |||
@@ -2,17 +2,46 @@ Source: openssh | |||
2 | Section: net | 2 | Section: net |
3 | Priority: standard | 3 | Priority: standard |
4 | Maintainer: Matthew Vernon <matthew@debian.org> | 4 | Maintainer: Matthew Vernon <matthew@debian.org> |
5 | Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, groff, debhelper (>=1.1.17), sharutils | 5 | Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, groff, debhelper (>= 2), sharutils |
6 | Standards-Version: 3.6.1 | 6 | Standards-Version: 3.6.1 |
7 | Uploaders: Colin Watson <cjwatson@debian.org> | 7 | Uploaders: Colin Watson <cjwatson@debian.org> |
8 | 8 | ||
9 | Package: ssh | 9 | Package: openssh-client |
10 | Architecture: any | 10 | Architecture: any |
11 | Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0) | 11 | Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0) |
12 | Conflicts: sftp, rsh-client (<<0.16.1-1) | ||
13 | Replaces: ssh (<< 1:3.8.1p1-9) | ||
14 | Suggests: ssh-askpass, xbase-clients | ||
15 | Provides: rsh-client, ssh-client | ||
16 | Description: Secure shell client, an rlogin/rsh/rcp replacement | ||
17 | This is the portable version of OpenSSH, a free implementation of | ||
18 | the Secure Shell protocol as specified by the IETF secsh working | ||
19 | group. | ||
20 | . | ||
21 | Ssh (Secure Shell) is a program for logging into a remote machine | ||
22 | and for executing commands on a remote machine. | ||
23 | It provides secure encrypted communications between two untrusted | ||
24 | hosts over an insecure network. X11 connections and arbitrary TCP/IP | ||
25 | ports can also be forwarded over the secure channel. | ||
26 | It is intended as a replacement for rlogin, rsh and rcp, and can be | ||
27 | used to provide applications with a secure communication channel. | ||
28 | . | ||
29 | This package provides the ssh client. | ||
30 | . | ||
31 | -------------------------------------------------------------------- | ||
32 | . | ||
33 | In some countries it may be illegal to use any encryption at all | ||
34 | without a special permit. | ||
35 | |||
36 | Package: openssh-server | ||
37 | Priority: optional | ||
38 | Architecture: any | ||
39 | Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) | ||
12 | Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) | 40 | Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) |
41 | Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11) | ||
13 | Suggests: ssh-askpass, xbase-clients | 42 | Suggests: ssh-askpass, xbase-clients |
14 | Provides: rsh-client | 43 | Provides: ssh-server |
15 | Description: Secure rlogin/rsh/rcp replacement (OpenSSH) | 44 | Description: Secure shell server, an rshd replacement |
16 | This is the portable version of OpenSSH, a free implementation of | 45 | This is the portable version of OpenSSH, a free implementation of |
17 | the Secure Shell protocol as specified by the IETF secsh working | 46 | the Secure Shell protocol as specified by the IETF secsh working |
18 | group. | 47 | group. |
@@ -25,18 +54,27 @@ Description: Secure rlogin/rsh/rcp replacement (OpenSSH) | |||
25 | It is intended as a replacement for rlogin, rsh and rcp, and can be | 54 | It is intended as a replacement for rlogin, rsh and rcp, and can be |
26 | used to provide applications with a secure communication channel. | 55 | used to provide applications with a secure communication channel. |
27 | . | 56 | . |
28 | This package provides both the ssh client and the sshd server. | 57 | This package provides the sshd server. |
29 | . | 58 | . |
30 | -------------------------------------------------------------------- | 59 | -------------------------------------------------------------------- |
31 | . | 60 | . |
32 | In some countries it may be illegal to use any encryption at all | 61 | In some countries it may be illegal to use any encryption at all |
33 | without a special permit. | 62 | without a special permit. |
34 | 63 | ||
64 | Package: ssh | ||
65 | Priority: optional | ||
66 | Architecture: all | ||
67 | Depends: openssh-client, openssh-server | ||
68 | Description: Secure shell client and server (transitional package) | ||
69 | This is a transitional package depending on both the OpenSSH client and | ||
70 | the OpenSSH server, which are now in separate packages. You may remove | ||
71 | it once the upgrade is complete and nothing depends on it. | ||
72 | |||
35 | Package: ssh-askpass-gnome | 73 | Package: ssh-askpass-gnome |
36 | Section: gnome | 74 | Section: gnome |
37 | Priority: optional | 75 | Priority: optional |
38 | Architecture: any | 76 | Architecture: any |
39 | Depends: ${shlibs:Depends}, ssh (>=1:1.2pre7-4) | ssh-krb5 | 77 | Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5 |
40 | Replaces: ssh (<< 1:3.5p1-3) | 78 | Replaces: ssh (<< 1:3.5p1-3) |
41 | Provides: ssh-askpass | 79 | Provides: ssh-askpass |
42 | Description: under X, asks user for a passphrase for ssh-add | 80 | Description: under X, asks user for a passphrase for ssh-add |