From 9ae0a67626fd9492faa3fc1487d3ffdd04b5c8c9 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Wed, 13 Dec 2006 03:01:37 +0000
Subject: * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't  
 sufficient to replace conffiles (closes: #402804).

---
 debian/changelog | 4 ++++
 debian/control   | 4 ++--
 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
     icon extension from .desktop file (closes:
     https://launchpad.net/bugs/27152).
 
+  [ Colin Watson ]
+  * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
+    sufficient to replace conffiles (closes: #402804).
+
  -- Colin Watson <cjwatson@debian.org>  Mon, 11 Dec 2006 15:04:44 +0000
 
 openssh (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
 Architecture: any
 Depends: ${shlibs:Depends}, ${debconf-depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
 Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
-Replaces: ssh (<< 1:3.8.1p1-9), ssh-krb5 (<< 1:4.3p2-7)
+Replaces: ssh, ssh-krb5
 Suggests: ssh-askpass, xbase-clients
 Provides: rsh-client, ssh-client
 Description: Secure shell client, an rlogin/rsh/rcp replacement
@@ -40,7 +40,7 @@ Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version})
 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 (<< 1:3.8.1p1-9), openssh-client (<< 1:3.8.1p1-11), ssh-krb5 (<< 1:4.3p2-7)
+Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
 Suggests: ssh-askpass, xbase-clients, rssh, molly-guard
 Provides: ssh-server
 Description: Secure shell server, an rshd replacement
-- 
cgit v1.2.3