diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-04 01:12:34 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-04 01:12:34 +0000 |
commit | aadc833cb675906215776f63ff64a664d1d031b3 (patch) | |
tree | c77eca8fc3a5a08cf0e8eb28754625018ed1aa75 /debian | |
parent | 9b05cd0b0436ad5cb429b4158e0912795900a43a (diff) |
Adjust short descriptions to avoid relying on previous experience with
rsh, based on suggestions from Reuben Thomas (closes: #512198).
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 18 |
2 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 1c8ecb194..c7017089e 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -46,6 +46,8 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low | |||
46 | are no longer particularly feasible anyway (closes: #420682). | 46 | are no longer particularly feasible anyway (closes: #420682). |
47 | * Cope with insserv reordering of init script links. | 47 | * Cope with insserv reordering of init script links. |
48 | * Remove init script stop link in rc1, as killprocs handles it already. | 48 | * Remove init script stop link in rc1, as killprocs handles it already. |
49 | * Adjust short descriptions to avoid relying on previous experience with | ||
50 | rsh, based on suggestions from Reuben Thomas (closes: #512198). | ||
49 | 51 | ||
50 | -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000 | 52 | -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000 |
51 | 53 | ||
diff --git a/debian/control b/debian/control index 25df28c5c..18b55e9f7 100644 --- a/debian/control +++ b/debian/control | |||
@@ -16,7 +16,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4 | |||
16 | Replaces: ssh, ssh-krb5 | 16 | Replaces: ssh, ssh-krb5 |
17 | Suggests: ssh-askpass, libpam-ssh, keychain | 17 | Suggests: ssh-askpass, libpam-ssh, keychain |
18 | Provides: rsh-client, ssh-client | 18 | Provides: rsh-client, ssh-client |
19 | Description: secure shell client, an rlogin/rsh/rcp replacement | 19 | Description: secure shell (SSH) client, for secure access to remote machines |
20 | This is the portable version of OpenSSH, a free implementation of | 20 | This is the portable version of OpenSSH, a free implementation of |
21 | the Secure Shell protocol as specified by the IETF secsh working | 21 | the Secure Shell protocol as specified by the IETF secsh working |
22 | group. | 22 | group. |
@@ -26,8 +26,8 @@ Description: secure shell client, an rlogin/rsh/rcp replacement | |||
26 | It provides secure encrypted communications between two untrusted | 26 | It provides secure encrypted communications between two untrusted |
27 | hosts over an insecure network. X11 connections and arbitrary TCP/IP | 27 | hosts over an insecure network. X11 connections and arbitrary TCP/IP |
28 | ports can also be forwarded over the secure channel. | 28 | ports can also be forwarded over the secure channel. |
29 | It is intended as a replacement for rlogin, rsh and rcp, and can be | 29 | It can be used to provide applications with a secure communication |
30 | used to provide applications with a secure communication channel. | 30 | channel. |
31 | . | 31 | . |
32 | This package provides the ssh, scp and sftp clients, the ssh-agent | 32 | This package provides the ssh, scp and sftp clients, the ssh-agent |
33 | and ssh-add programs to make public key authentication more convenient, | 33 | and ssh-add programs to make public key authentication more convenient, |
@@ -35,6 +35,9 @@ Description: secure shell client, an rlogin/rsh/rcp replacement | |||
35 | . | 35 | . |
36 | In some countries it may be illegal to use any encryption at all | 36 | In some countries it may be illegal to use any encryption at all |
37 | without a special permit. | 37 | without a special permit. |
38 | . | ||
39 | ssh replaces the insecure rsh, rcp and rlogin programs, which are | ||
40 | obsolete for most purposes. | ||
38 | 41 | ||
39 | Package: openssh-server | 42 | Package: openssh-server |
40 | Priority: optional | 43 | Priority: optional |
@@ -45,7 +48,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-c | |||
45 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | 48 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 |
46 | Suggests: ssh-askpass, rssh, molly-guard, ufw | 49 | Suggests: ssh-askpass, rssh, molly-guard, ufw |
47 | Provides: ssh-server | 50 | Provides: ssh-server |
48 | Description: secure shell server, an rshd replacement | 51 | Description: secure shell (SSH) server, for secure access from remote machines |
49 | This is the portable version of OpenSSH, a free implementation of | 52 | This is the portable version of OpenSSH, a free implementation of |
50 | the Secure Shell protocol as specified by the IETF secsh working | 53 | the Secure Shell protocol as specified by the IETF secsh working |
51 | group. | 54 | group. |
@@ -55,13 +58,16 @@ Description: secure shell server, an rshd replacement | |||
55 | It provides secure encrypted communications between two untrusted | 58 | It provides secure encrypted communications between two untrusted |
56 | hosts over an insecure network. X11 connections and arbitrary TCP/IP | 59 | hosts over an insecure network. X11 connections and arbitrary TCP/IP |
57 | ports can also be forwarded over the secure channel. | 60 | ports can also be forwarded over the secure channel. |
58 | It is intended as a replacement for rlogin, rsh and rcp, and can be | 61 | It can be used to provide applications with a secure communication |
59 | used to provide applications with a secure communication channel. | 62 | channel. |
60 | . | 63 | . |
61 | This package provides the sshd server. | 64 | This package provides the sshd server. |
62 | . | 65 | . |
63 | In some countries it may be illegal to use any encryption at all | 66 | In some countries it may be illegal to use any encryption at all |
64 | without a special permit. | 67 | without a special permit. |
68 | . | ||
69 | sshd replaces the insecure rshd program, which is obsolete for most | ||
70 | purposes. | ||
65 | 71 | ||
66 | Package: ssh | 72 | Package: ssh |
67 | Priority: extra | 73 | Priority: extra |