From cfdb474537f6efdf694505ccba032649d94b86c3 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 28 Jul 2011 14:49:33 +0100 Subject: * Merge from Ubuntu (Dustin Kirkland): - openssh-server Recommends: ssh-import-id (no-op in Debian since that package doesn't exist there, but this reduces the Ubuntu delta). --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3fd5cf016..089e7ab9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ openssh (1:5.8p1-6) UNRELEASED; urgency=low * Quieten logs when multiple from= restrictions are used in different authorized_keys lines for the same key; it's still not ideal, but at least you'll only get one log entry per key (closes: #630606). + * Merge from Ubuntu (Dustin Kirkland): + - openssh-server Recommends: ssh-import-id (no-op in Debian since that + package doesn't exist there, but this reduces the Ubuntu delta). -- Colin Watson Thu, 28 Jul 2011 11:57:27 +0100 diff --git a/debian/control b/debian/control index 63bf2df87..83626a3e5 100644 --- a/debian/control +++ b/debian/control @@ -44,7 +44,7 @@ Package: openssh-server Priority: optional Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), procps -Recommends: xauth, openssh-blacklist, openssh-blacklist-extra +Recommends: xauth, openssh-blacklist, openssh-blacklist-extra, ssh-import-id 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, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere -- cgit v1.2.3