summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2006-12-13 03:01:37 +0000
committerColin Watson <cjwatson@debian.org>2006-12-13 03:01:37 +0000
commit9ae0a67626fd9492faa3fc1487d3ffdd04b5c8c9 (patch)
tree275b8c770f83bcb571dcc446596e86c5ff6e4675 /debian
parent418b09765243d274fa326639dc34961acb9792d7 (diff)
* Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
sufficient to replace conffiles (closes: #402804).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control4
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b3b620f53..f68d8c832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ openssh (1:4.3p2-8) UNRELEASED; urgency=low
5 icon extension from .desktop file (closes: 5 icon extension from .desktop file (closes:
6 https://launchpad.net/bugs/27152). 6 https://launchpad.net/bugs/27152).
7 7
8 [ Colin Watson ]
9 * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
10 sufficient to replace conffiles (closes: #402804).
11
8 -- Colin Watson <cjwatson@debian.org> Mon, 11 Dec 2006 15:04:44 +0000 12 -- Colin Watson <cjwatson@debian.org> Mon, 11 Dec 2006 15:04:44 +0000
9 13
10openssh (1:4.3p2-7) unstable; urgency=medium 14openssh (1:4.3p2-7) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0f77b73db..49c105f03 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: openssh-client
10Architecture: any 10Architecture: any
11Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd 11Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
12Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 12Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
13Replaces: ssh (<< 1:3.8.1p1-9), ssh-krb5 (<< 1:4.3p2-7) 13Replaces: ssh, ssh-krb5
14Suggests: ssh-askpass, xbase-clients 14Suggests: ssh-askpass, xbase-clients
15Provides: rsh-client, ssh-client 15Provides: rsh-client, ssh-client
16Description: Secure shell client, an rlogin/rsh/rcp replacement 16Description: Secure shell client, an rlogin/rsh/rcp replacement
@@ -40,7 +40,7 @@ Priority: 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 (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 42Conflicts: 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)
43Replaces: ssh (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5 (<< 1:4.3p2-7) 43Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
44Suggests: ssh-askpass, xbase-clients, rssh, molly-guard 44Suggests: ssh-askpass, xbase-clients, rssh, molly-guard
45Provides: ssh-server 45Provides: ssh-server
46Description: Secure shell server, an rshd replacement 46Description: Secure shell server, an rshd replacement