summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-09-14 13:59:45 +0000
committerColin Watson <cjwatson@debian.org>2005-09-14 13:59:45 +0000
commit6bb9329685b7febe07c895b8064535c4251a8d92 (patch)
treeb74aa8cb581fe573a64eb74a959c12b8b824bde6 /debian
parentb34b9bce64898ec4b444424c9211619a2249f583 (diff)
* openssh-client and openssh-server conflict with pre-split ssh to avoid
problems when ssh is left un-upgraded (closes: #324695).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1d527aa7c..4f1e2e392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ openssh (1:4.2p1-1) UNRELEASED; urgency=low
15 - Many bugfixes and improvements to connection multiplexing. 15 - Many bugfixes and improvements to connection multiplexing.
16 - Don't pretend to accept $HOME (closes: #208648). 16 - Don't pretend to accept $HOME (closes: #208648).
17 * debian/rules: Resynchronise CFLAGS with that generated by configure. 17 * debian/rules: Resynchronise CFLAGS with that generated by configure.
18 * openssh-client and openssh-server conflict with pre-split ssh to avoid
19 problems when ssh is left un-upgraded (closes: #324695).
18 20
19 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 13:35:17 +0100 21 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 13:35:17 +0100
20 22
diff --git a/debian/control b/debian/control
index 8d8f30fe4..3ba6b4606 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), ssh-krb5 12Conflicts: ssh (<< 1:3.8.1p1-9), 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), ssh-krb5 42Conflicts: ssh (<< 1:3.8.1p1-9), 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