summaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-07-28 14:49:33 +0100
committerColin Watson <cjwatson@debian.org>2011-07-28 14:49:33 +0100
commitcfdb474537f6efdf694505ccba032649d94b86c3 (patch)
treea95d5eb20cb1156238e1aee85596996d505cbf6e /debian/control
parent7a15b74572af22c2642ce0b125a90f35a92a10b4 (diff)
* 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).
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control2
1 files changed, 1 insertions, 1 deletions
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
44Priority: optional 44Priority: optional
45Architecture: any 45Architecture: any
46Depends: ${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 46Depends: ${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
47Recommends: xauth, openssh-blacklist, openssh-blacklist-extra 47Recommends: xauth, openssh-blacklist, openssh-blacklist-extra, ssh-import-id
48Conflicts: 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) 48Conflicts: 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)
49Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 49Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
50Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere 50Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere