diff options
author | Colin Watson <cjwatson@debian.org> | 2007-04-24 10:41:44 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-04-24 10:41:44 +0000 |
commit | 2c1c7627e44366237e00de2f330827bf19e0a557 (patch) | |
tree | 2921b2228b8d0570e33b44d82d0effa309a11f3b /debian/control | |
parent | 5a1780255962e5477050bafeb29190c0491ec5a1 (diff) |
* Apply results of debconf templates and package descriptions review by
debian-l10n-english (closes: #420107).
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/debian/control b/debian/control index e7cd1f8e0..b8727ccc4 100644 --- a/debian/control +++ b/debian/control | |||
@@ -13,7 +13,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4 | |||
13 | Replaces: ssh, ssh-krb5 | 13 | Replaces: ssh, ssh-krb5 |
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 |
17 | This is the portable version of OpenSSH, a free implementation of | 17 | This is the portable version of OpenSSH, a free implementation of |
18 | the Secure Shell protocol as specified by the IETF secsh working | 18 | the Secure Shell protocol as specified by the IETF secsh working |
19 | group. | 19 | group. |
@@ -21,7 +21,7 @@ Description: Secure shell client, an rlogin/rsh/rcp replacement | |||
21 | Ssh (Secure Shell) is a program for logging into a remote machine | 21 | Ssh (Secure Shell) is a program for logging into a remote machine |
22 | and for executing commands on a remote machine. | 22 | and for executing commands on a remote machine. |
23 | It provides secure encrypted communications between two untrusted | 23 | It provides secure encrypted communications between two untrusted |
24 | hosts over an insecure network. X11 connections and arbitrary TCP/IP | 24 | hosts over an insecure network. X11 connections and arbitrary TCP/IP |
25 | ports can also be forwarded over the secure channel. | 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 | 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. | 27 | used to provide applications with a secure communication channel. |
@@ -30,8 +30,6 @@ Description: Secure shell client, an rlogin/rsh/rcp replacement | |||
30 | and ssh-add programs to make public key authentication more convenient, | 30 | and ssh-add programs to make public key authentication more convenient, |
31 | and the ssh-keygen, ssh-keyscan, ssh-copy-id and ssh-argv0 utilities. | 31 | and the ssh-keygen, ssh-keyscan, ssh-copy-id and ssh-argv0 utilities. |
32 | . | 32 | . |
33 | -------------------------------------------------------------------- | ||
34 | . | ||
35 | In some countries it may be illegal to use any encryption at all | 33 | In some countries it may be illegal to use any encryption at all |
36 | without a special permit. | 34 | without a special permit. |
37 | 35 | ||
@@ -43,7 +41,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-c | |||
43 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | 41 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 |
44 | Suggests: ssh-askpass, xbase-clients, rssh, molly-guard | 42 | Suggests: ssh-askpass, xbase-clients, rssh, molly-guard |
45 | Provides: ssh-server | 43 | Provides: ssh-server |
46 | Description: Secure shell server, an rshd replacement | 44 | Description: secure shell server, an rshd replacement |
47 | This is the portable version of OpenSSH, a free implementation of | 45 | This is the portable version of OpenSSH, a free implementation of |
48 | the Secure Shell protocol as specified by the IETF secsh working | 46 | the Secure Shell protocol as specified by the IETF secsh working |
49 | group. | 47 | group. |
@@ -51,15 +49,13 @@ Description: Secure shell server, an rshd replacement | |||
51 | Ssh (Secure Shell) is a program for logging into a remote machine | 49 | Ssh (Secure Shell) is a program for logging into a remote machine |
52 | and for executing commands on a remote machine. | 50 | and for executing commands on a remote machine. |
53 | It provides secure encrypted communications between two untrusted | 51 | It provides secure encrypted communications between two untrusted |
54 | hosts over an insecure network. X11 connections and arbitrary TCP/IP | 52 | hosts over an insecure network. X11 connections and arbitrary TCP/IP |
55 | ports can also be forwarded over the secure channel. | 53 | ports can also be forwarded over the secure channel. |
56 | 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 |
57 | used to provide applications with a secure communication channel. | 55 | used to provide applications with a secure communication channel. |
58 | . | 56 | . |
59 | This package provides the sshd server. | 57 | This package provides the sshd server. |
60 | . | 58 | . |
61 | -------------------------------------------------------------------- | ||
62 | . | ||
63 | In some countries it may be illegal to use any encryption at all | 59 | In some countries it may be illegal to use any encryption at all |
64 | without a special permit. | 60 | without a special permit. |
65 | 61 | ||
@@ -67,7 +63,7 @@ Package: ssh | |||
67 | Priority: extra | 63 | Priority: extra |
68 | Architecture: all | 64 | Architecture: all |
69 | Depends: openssh-client, openssh-server | 65 | Depends: openssh-client, openssh-server |
70 | Description: Secure shell client and server (transitional package) | 66 | Description: secure shell client and server (transitional package) |
71 | This is a transitional package depending on both the OpenSSH client and | 67 | This is a transitional package depending on both the OpenSSH client and |
72 | the OpenSSH server, which are now in separate packages. You may remove | 68 | the OpenSSH server, which are now in separate packages. You may remove |
73 | it once the upgrade is complete and nothing depends on it. | 69 | it once the upgrade is complete and nothing depends on it. |
@@ -76,10 +72,10 @@ Package: ssh-krb5 | |||
76 | Priority: extra | 72 | Priority: extra |
77 | Architecture: all | 73 | Architecture: all |
78 | Depends: openssh-client, openssh-server | 74 | Depends: openssh-client, openssh-server |
79 | Description: Secure shell client and server (transitional package) | 75 | Description: secure shell client and server (transitional package) |
80 | This is a transitional package depending on the regular Debian OpenSSH | 76 | This is a transitional package depending on the regular Debian OpenSSH |
81 | client and server, which now support GSSAPI natively. It will add the | 77 | client and server, which now support GSSAPI natively. It will add the |
82 | necessary GSSAPI options to the server configuration file. You can | 78 | necessary GSSAPI options to the server configuration file. You can |
83 | remove it once the upgrade is complete and nothing depends on it. | 79 | remove it once the upgrade is complete and nothing depends on it. |
84 | 80 | ||
85 | Package: ssh-askpass-gnome | 81 | Package: ssh-askpass-gnome |
@@ -89,7 +85,7 @@ Architecture: any | |||
89 | Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5 | 85 | Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5 |
90 | Replaces: ssh (<< 1:3.5p1-3) | 86 | Replaces: ssh (<< 1:3.5p1-3) |
91 | Provides: ssh-askpass | 87 | Provides: ssh-askpass |
92 | Description: under X, asks user for a passphrase for ssh-add | 88 | Description: interactive X program to prompt users for a passphrase for ssh-add |
93 | This has been split out of the main ssh package, so that the ssh will | 89 | This has been split out of the main ssh package, so that the ssh will |
94 | not need to depend upon the Gnome libraries. | 90 | not need to depend upon the Gnome libraries. |
95 | . | 91 | . |
@@ -103,7 +99,7 @@ Priority: optional | |||
103 | Architecture: any | 99 | Architecture: any |
104 | Depends: ${shlibs:Depends}, libnss-files-udeb | 100 | Depends: ${shlibs:Depends}, libnss-files-udeb |
105 | XB-Installer-Menu-Item: 99900 | 101 | XB-Installer-Menu-Item: 99900 |
106 | Description: Secure shell client for the Debian installer | 102 | Description: secure shell client for the Debian installer |
107 | This is the portable version of OpenSSH, a free implementation of | 103 | This is the portable version of OpenSSH, a free implementation of |
108 | the Secure Shell protocol as specified by the IETF secsh working | 104 | the Secure Shell protocol as specified by the IETF secsh working |
109 | group. | 105 | group. |
@@ -116,7 +112,7 @@ Section: debian-installer | |||
116 | Priority: optional | 112 | Priority: optional |
117 | Architecture: any | 113 | Architecture: any |
118 | Depends: ${shlibs:Depends}, libnss-files-udeb | 114 | Depends: ${shlibs:Depends}, libnss-files-udeb |
119 | Description: Secure shell server for the Debian installer | 115 | Description: secure shell server for the Debian installer |
120 | This is the portable version of OpenSSH, a free implementation of | 116 | This is the portable version of OpenSSH, a free implementation of |
121 | the Secure Shell protocol as specified by the IETF secsh working | 117 | the Secure Shell protocol as specified by the IETF secsh working |
122 | group. | 118 | group. |