diff options
| author | Colin Watson <cjwatson@debian.org> | 2005-09-14 13:59:45 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 13:59:45 +0000 |
| commit | 6bb9329685b7febe07c895b8064535c4251a8d92 (patch) | |
| tree | b74aa8cb581fe573a64eb74a959c12b8b824bde6 /debian/control | |
| parent | b34b9bce64898ec4b444424c9211619a2249f583 (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/control')
| -rw-r--r-- | debian/control | 4 |
1 files changed, 2 insertions, 2 deletions
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> | |||
| 9 | Package: openssh-client | 9 | 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: 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) |
| 14 | Suggests: ssh-askpass, xbase-clients | 14 | Suggests: ssh-askpass, xbase-clients |
| 15 | Provides: rsh-client, ssh-client | 15 | Provides: rsh-client, ssh-client |
| @@ -39,7 +39,7 @@ Package: openssh-server | |||
| 39 | Priority: optional | 39 | 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-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) |
| 44 | Suggests: ssh-askpass, xbase-clients, rssh | 44 | Suggests: ssh-askpass, xbase-clients, rssh |
| 45 | Provides: ssh-server | 45 | Provides: ssh-server |