From e3345d210a77907d29d05a60d359e7f09499c839 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 8 Jun 2005 11:19:34 +0000 Subject: openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5 only conflicts with ssh (closes: #312475). --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3bf40137a..c1a01a636 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openssh (1:4.1p1-4) UNRELEASED; urgency=low + + * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5 + only conflicts with ssh (closes: #312475). + + -- Colin Watson Wed, 8 Jun 2005 12:11:25 +0100 + openssh (1:4.1p1-3) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 76f02ec30..4e7cfd1b1 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Uploaders: Colin Watson Package: openssh-client Architecture: any Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0) -Conflicts: sftp, rsh-client (<<0.16.1-1) +Conflicts: sftp, rsh-client (<<0.16.1-1), ssh-krb5 Replaces: ssh (<< 1:3.8.1p1-9) Suggests: ssh-askpass, xbase-clients Provides: rsh-client, ssh-client @@ -39,7 +39,7 @@ Package: openssh-server 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-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) +Conflicts: 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) Suggests: ssh-askpass, xbase-clients, rssh Provides: ssh-server -- cgit v1.2.3