summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-12 12:46:36 +0000
committerColin Watson <cjwatson@debian.org>2014-02-12 12:46:36 +0000
commit9fc1dfa4ea2310b4fcc835bc0b2bb3903bdb2810 (patch)
tree2a2f26ba7dec8a7b5f88364dd5536804a96ee706
parent54ee8007e8f03583d54c175da2cf2a8fc2123e5c (diff)
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.
-rw-r--r--debian/changelog5
-rw-r--r--debian/control6
2 files changed, 8 insertions, 3 deletions
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
16 the -D option to suppress daemonisation anyway. 16 the -D option to suppress daemonisation anyway.
17 * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the 17 * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the
18 Debian patch) rather than plain GPL. 18 Debian patch) rather than plain GPL.
19 * Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9),
20 rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2),
21 and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch
22 versions, for which we no longer have maintainer script code, and per
23 policy they would have to become Breaks nowadays anyway.
19 24
20 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 25 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000
21 26
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
13Architecture: any 13Architecture: any
14Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd 14Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
15Recommends: xauth 15Recommends: xauth
16Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 16Conflicts: sftp
17Replaces: ssh, ssh-krb5 17Replaces: ssh, ssh-krb5
18Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere 18Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere
19Provides: rsh-client, ssh-client 19Provides: rsh-client, ssh-client
@@ -47,8 +47,8 @@ Architecture: any
47Pre-Depends: ${misc:Pre-Depends} 47Pre-Depends: ${misc:Pre-Depends}
48Depends: ${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 48Depends: ${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
49Recommends: xauth, ncurses-term, ${openssh-server:Recommends} 49Recommends: xauth, ncurses-term, ${openssh-server:Recommends}
50Conflicts: 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) 50Conflicts: ssh-socks, ssh2, sftp
51Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 51Replaces: ssh, ssh-krb5
52Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere 52Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere
53Provides: ssh-server 53Provides: ssh-server
54Multi-Arch: foreign 54Multi-Arch: foreign