From 9fc1dfa4ea2310b4fcc835bc0b2bb3903bdb2810 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 12 Feb 2014 12:46:36 +0000 Subject: Drop some very old Conflicts and Replaces Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9), rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2), and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch versions, for which we no longer have maintainer script code, and per policy they would have to become Breaks nowadays anyway. --- debian/changelog | 5 +++++ debian/control | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4c8c8981d..00dbd7661 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,11 @@ openssh (1:6.5p1-3) UNRELEASED; urgency=medium the -D option to suppress daemonisation anyway. * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the Debian patch) rather than plain GPL. + * Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9), + rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2), + and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch + versions, for which we no longer have maintainer script code, and per + policy they would have to become Breaks nowadays anyway. -- Colin Watson Tue, 11 Feb 2014 21:36:14 +0000 diff --git a/debian/control b/debian/control index 78746affe..62d14ee4f 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Package: openssh-client Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd Recommends: xauth -Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) +Conflicts: sftp Replaces: ssh, ssh-krb5 Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere Provides: rsh-client, ssh-client @@ -47,8 +47,8 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps Recommends: xauth, ncurses-term, ${openssh-server:Recommends} -Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) -Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 +Conflicts: ssh-socks, ssh2, sftp +Replaces: ssh, ssh-krb5 Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere Provides: ssh-server Multi-Arch: foreign -- cgit v1.2.3