summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules9
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 @@
1openssh (1:5.8p1-7) UNRELEASED; urgency=low
2
3 * Only recommend ssh-import-id when built on Ubuntu (closes: #635887).
4
5 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 13:51:26 +0100
6
1openssh (1:5.8p1-6) unstable; urgency=low 7openssh (1:5.8p1-6) unstable; urgency=low
2 8
3 * openssh-client and openssh-server Suggests: monkeysphere. 9 * 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
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, ssh-import-id 47Recommends: xauth, openssh-blacklist, openssh-blacklist-extra, ${openssh-server:Recommends}
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
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
66endif 66endif
67SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11 67SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
68 68
69ifeq ($(DISTRIBUTOR),Ubuntu)
70server_recommends := ssh-import-id
71else
72server_recommends :=
73endif
74
69# Common path configuration. 75# Common path configuration.
70confflags += --sysconfdir=/etc/ssh 76confflags += --sysconfdir=/etc/ssh
71 77
@@ -201,6 +207,9 @@ override_dh_installdeb:
201 ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/sshd \ 207 ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/sshd \
202 debian/openssh-server/DEBIAN/preinst 208 debian/openssh-server/DEBIAN/preinst
203 209
210override_dh_gencontrol:
211 dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'
212
204debian/faq.html: 213debian/faq.html:
205 wget -O - http://www.openssh.org/faq.html | \ 214 wget -O - http://www.openssh.org/faq.html | \
206 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \ 215 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \