summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5aafdfff0..e0f35ef1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,8 @@ openssh (1:4.6p1-1) UNRELEASED; urgency=low
68 to take advantage of address space layout randomisation. 68 to take advantage of address space layout randomisation.
69 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to 69 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
70 the default path. 70 the default path.
71 * Use ${binary:Version} rather than ${Source-Version} in openssh-server ->
72 openssh-client dependency.
71 73
72 -- Colin Watson <cjwatson@ubuntu.com> Tue, 12 Jun 2007 14:31:01 +0100 74 -- Colin Watson <cjwatson@ubuntu.com> Tue, 12 Jun 2007 14:31:01 +0100
73 75
diff --git a/debian/control b/debian/control
index 4c1c47b7b..f89c9bfed 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Description: secure shell client, an rlogin/rsh/rcp replacement
36Package: openssh-server 36Package: openssh-server
37Priority: optional 37Priority: optional
38Architecture: any 38Architecture: any
39Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${Source-Version}), lsb-base (>= 3.0-6) 39Depends: ${shlibs:Depends}, ${debconf-depends}, ${pam-depends}, libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.0-6)
40Conflicts: 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) 40Conflicts: 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)
41Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 41Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
42Suggests: ssh-askpass, xbase-clients, rssh, molly-guard 42Suggests: ssh-askpass, xbase-clients, rssh, molly-guard