summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/control4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 3bf40137a..c1a01a636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:4.1p1-4) UNRELEASED; urgency=low
2
3 * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5
4 only conflicts with ssh (closes: #312475).
5
6 -- Colin Watson <cjwatson@debian.org> Wed, 8 Jun 2005 12:11:25 +0100
7
1openssh (1:4.1p1-3) unstable; urgency=low 8openssh (1:4.1p1-3) unstable; urgency=low
2 9
3 * Upload to unstable. 10 * 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 <cjwatson@debian.org>
9Package: openssh-client 9Package: openssh-client
10Architecture: any 10Architecture: any
11Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0) 11Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0)
12Conflicts: sftp, rsh-client (<<0.16.1-1) 12Conflicts: sftp, rsh-client (<<0.16.1-1), ssh-krb5
13Replaces: ssh (<< 1:3.8.1p1-9) 13Replaces: ssh (<< 1:3.8.1p1-9)
14Suggests: ssh-askpass, xbase-clients 14Suggests: ssh-askpass, xbase-clients
15Provides: rsh-client, ssh-client 15Provides: rsh-client, ssh-client
@@ -39,7 +39,7 @@ Package: openssh-server
39Priority: optional 39Priority: optional
40Architecture: any 40Architecture: any
41Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}) 41Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
42Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1) 42Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5
43Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11) 43Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11)
44Suggests: ssh-askpass, xbase-clients, rssh 44Suggests: ssh-askpass, xbase-clients, rssh
45Provides: ssh-server 45Provides: ssh-server