Merge Upstart job scripting support from Ubuntu, to handle the Upstart job being primary there.

1 files changed, 23 insertions, 3 deletions

diff --git a/debian/rules b/debian/rules
index a2efd3a0b..5cf42b692 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ endif
 # Change the version string to include the Debian version
 SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
 
-DISTRIBUTOR := $(shell dpkg-vendor --derives-from Ubuntu 2>/dev/null && echo Ubuntu)
+DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi)
 ifeq ($(DISTRIBUTOR),Ubuntu)
 DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
 else
@@ -115,6 +115,16 @@ confflags_udeb += --with-ldflags='-Wl,--as-needed'
 %:
         dh $@
 
+DISTRIBUTOR_REPLACE := \
+        debian/openssh-server.if-up \
+        debian/openssh-server.ssh.init \
+        debian/openssh-server.postinst \
+        debian/openssh-server.prerm \
+        debian/ssh-krb5.postinst
+
+debian/%: debian/%.in
+        sed 's/@DISTRIBUTOR@/$(DISTRIBUTOR)/g' $< >$@
+
 override_dh_auto_configure:
         dh_auto_configure -Bbuild-deb -- $(confflags)
         dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
@@ -147,10 +157,14 @@ endif
         (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
                 > debian/copyright
 
+override_dh_clean:
+        dh_clean
+        rm -f $(DISTRIBUTOR_REPLACE)
+
 override_dh_auto_install:
         $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
 
-override_dh_install:
+override_dh_install: $(DISTRIBUTOR_REPLACE)
         rm -f debian/tmp/etc/ssh/sshd_config
 
         dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
@@ -176,6 +190,12 @@ override_dh_installdocs:
 
 override_dh_installinit:
         dh_installinit -n --name ssh
+ifeq ($(DISTRIBUTOR),Ubuntu)
+        # We need to keep the init script as well as the Upstart job for
+        # now, for the benefit of people running sshd in chroots.
+        install -D -o root -g root debian/openssh-server.ssh.init debian/openssh-server/etc/init.d/ssh
+        install -D -o root -g root -m 644 debian/openssh-server.ssh.default debian/openssh-server/etc/default/ssh
+endif
 
 override_dh_installpam:
         dh_installpam --name sshd
@@ -189,7 +209,7 @@ override_dh_shlibdeps:
         dh_shlibdeps
         debian/adjust-openssl-dependencies
 
-override_dh_installdeb:
+override_dh_installdeb: $(DISTRIBUTOR_REPLACE)
         dh_installdeb
         perl -i debian/substitute-conffile.pl \
                 ETC_SSH_MODULI debian/openssh-client/etc/ssh/moduli \