diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/control | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 5da5c8477..c3bad51c6 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -6,6 +6,7 @@ openssh (1:4.2p1-2) UNRELEASED; urgency=low | |||
6 | http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen | 6 | http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen |
7 | Frost). | 7 | Frost). |
8 | - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr. | 8 | - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr. |
9 | - openssh-client and openssh-server replace ssh-krb5. | ||
9 | 10 | ||
10 | -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:48:57 +0100 | 11 | -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:48:57 +0100 |
11 | 12 | ||
diff --git a/debian/control b/debian/control index 9785b9f5d..affe2e4a5 100644 --- a/debian/control +++ b/debian/control | |||
@@ -10,7 +10,7 @@ Package: openssh-client | |||
10 | Architecture: any | 10 | Architecture: any |
11 | Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0) | 11 | Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0) |
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 |
13 | Replaces: ssh (<< 1:3.8.1p1-9) | 13 | Replaces: ssh (<< 1:3.8.1p1-9), 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 |
@@ -40,7 +40,7 @@ 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 |
43 | Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11) | 43 | Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5 |
44 | Suggests: ssh-askpass, xbase-clients, rssh | 44 | Suggests: ssh-askpass, xbase-clients, rssh |
45 | Provides: ssh-server | 45 | Provides: ssh-server |
46 | Description: Secure shell server, an rshd replacement | 46 | Description: Secure shell server, an rshd replacement |