2 files changed, 10 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index f4bb9d57b..0941e5d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:6.1p1-3) UNRELEASED; urgency=low
+
+  * Give ssh and ssh-krb5 versioned dependencies on openssh-client and
+    openssh-server, to try to reduce confusion when people run 'apt-get
+    install ssh' or similar and expect that to upgrade everything relevant.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 19 Dec 2012 10:50:33 +0000
+
 openssh (1:6.1p1-2) experimental; urgency=low
 
   * Use xz compression for binary packages.
diff --git a/debian/control b/debian/control
index 600d5c915..3359c8b39 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Description: secure shell (SSH) server, for secure access from remote machines
 Package: ssh
 Priority: extra
 Architecture: all
-Depends: ${misc:Depends}, openssh-client, openssh-server
+Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
 Description: secure shell client and server (metapackage)
  This metapackage is a convenient way to install both the OpenSSH client
  and the OpenSSH server. It provides nothing in and of itself, so you
@@ -85,7 +85,7 @@ Package: ssh-krb5
 Section: oldlibs
 Priority: extra
 Architecture: all
-Depends: ${misc:Depends}, openssh-client, openssh-server
+Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
 Description: secure shell client and server (transitional package)
  This is a transitional package depending on the regular Debian OpenSSH
  client and server, which now support GSSAPI natively. It will add the