- openssh-client and openssh-server replace ssh-krb5.

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
       http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen
       Frost).
     - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr.
+    - openssh-client and openssh-server replace ssh-krb5.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 14 Sep 2005 15:48:57 +0100
 
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
 Architecture: any
 Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0)
 Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5
-Replaces: ssh (<< 1:3.8.1p1-9)
+Replaces: ssh (<< 1:3.8.1p1-9), ssh-krb5
 Suggests: ssh-askpass, xbase-clients
 Provides: rsh-client, ssh-client
 Description: Secure shell client, an rlogin/rsh/rcp replacement
@@ -40,7 +40,7 @@ Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
 Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5
-Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11)
+Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5
 Suggests: ssh-askpass, xbase-clients, rssh
 Provides: ssh-server
 Description: Secure shell server, an rshd replacement