3 files changed, 16 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 2e9c67177..5c8edd737 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:5.8p1-7) UNRELEASED; urgency=low
+
+  * Only recommend ssh-import-id when built on Ubuntu (closes: #635887).
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 29 Jul 2011 13:51:26 +0100
+
 openssh (1:5.8p1-6) unstable; urgency=low
 
   * openssh-client and openssh-server Suggests: monkeysphere.
diff --git a/debian/control b/debian/control
index 83626a3e5..8ea645dea 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, ssh-import-id
+Recommends: xauth, openssh-blacklist, openssh-blacklist-extra, ${openssh-server:Recommends}
 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
diff --git a/debian/rules b/debian/rules
index 1c58630f3..9731c320b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,12 @@ DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
 endif
 SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
 
+ifeq ($(DISTRIBUTOR),Ubuntu)
+server_recommends := ssh-import-id
+else
+server_recommends :=
+endif
+
 # Common path configuration.
 confflags += --sysconfdir=/etc/ssh
 
@@ -201,6 +207,9 @@ override_dh_installdeb:
                 ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/sshd \
                 debian/openssh-server/DEBIAN/preinst
 
+override_dh_gencontrol:
+        dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'
+
 debian/faq.html:
         wget -O - http://www.openssh.org/faq.html | \
                 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \