diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c811b9b37..237acd15c 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,9 @@ | |||
1 | openssh (1:5.9p1-2) UNRELEASED; urgency=low | ||
2 | |||
3 | * Mark openssh-client and openssh-server as Multi-Arch: foreign. | ||
4 | |||
5 | -- Colin Watson <cjwatson@debian.org> Wed, 09 Nov 2011 02:05:10 +0000 | ||
6 | |||
1 | openssh (1:5.9p1-1) unstable; urgency=low | 7 | openssh (1:5.9p1-1) unstable; urgency=low |
2 | 8 | ||
3 | * New upstream release (http://www.openssh.org/txt/release-5.9). | 9 | * New upstream release (http://www.openssh.org/txt/release-5.9). |
diff --git a/debian/control b/debian/control index 8ea645dea..ab0d2a979 100644 --- a/debian/control +++ b/debian/control | |||
@@ -17,6 +17,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4 | |||
17 | Replaces: ssh, ssh-krb5 | 17 | Replaces: ssh, ssh-krb5 |
18 | Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere | 18 | Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere |
19 | Provides: rsh-client, ssh-client | 19 | Provides: rsh-client, ssh-client |
20 | Multi-Arch: foreign | ||
20 | Description: secure shell (SSH) client, for secure access to remote machines | 21 | Description: secure shell (SSH) client, for secure access to remote machines |
21 | This is the portable version of OpenSSH, a free implementation of | 22 | This is the portable version of OpenSSH, a free implementation of |
22 | the Secure Shell protocol as specified by the IETF secsh working | 23 | the Secure Shell protocol as specified by the IETF secsh working |
@@ -49,6 +50,7 @@ Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-c | |||
49 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | 50 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 |
50 | Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere | 51 | Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere |
51 | Provides: ssh-server | 52 | Provides: ssh-server |
53 | Multi-Arch: foreign | ||
52 | Description: secure shell (SSH) server, for secure access from remote machines | 54 | Description: secure shell (SSH) server, for secure access from remote machines |
53 | This is the portable version of OpenSSH, a free implementation of | 55 | This is the portable version of OpenSSH, a free implementation of |
54 | the Secure Shell protocol as specified by the IETF secsh working | 56 | the Secure Shell protocol as specified by the IETF secsh working |