[Pkg-samba-maint] [samba] 01/03: The samba-ad-dc upstart job should be installed unconditionally, not just in Ubuntu.

[Steve Langasek]

This is an automated email from the git hooks/post-receive script.

vorlon pushed a commit to branch samba_4.0
in repository samba.

commit 5aa62a3ecee11a0f6481a1bd634f9017cb3cd625
Author: Steve Langasek <steve.langasek at canonical.com>
Date:   Fri Aug 16 02:07:53 2013 +0200

    The samba-ad-dc upstart job should be installed unconditionally, not just in Ubuntu.
---
 debian/changelog                                       |    7 +++++++
 debian/rules                                           |    9 ---------
 debian/{samba-ad-dc.upstart.in => samba-ad-dc.upstart} |    0
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e22a519..f09be91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:4.0.8+dfsg-2) UNRELEASED; urgency=low
+
+  * The samba-ad-dc upstart job should be installed unconditionally, not just
+    in Ubuntu.
+
+ -- Steve Langasek <vorlon at debian.org>  Fri, 16 Aug 2013 02:00:12 +0200
+
 samba (2:4.0.8+dfsg-1) experimental; urgency=low
 
   [ Christian Perrier ]
diff --git a/debian/rules b/debian/rules
index dd943f9..7372cd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,6 @@ override_dh_auto_configure:
 
 override_dh_auto_clean:
 	-$(WAF) clean
-	rm -f debian/*.upstart
 	find . -name "*.pyc" | xargs rm -f
 	rm -rf buildtools/bin/.waf-*
 	rm -rf bin
@@ -164,14 +163,6 @@ override_dh_gencontrol:
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/samba -X/usr/lib/$(DEB_HOST_MULTIARCH)/plugin
 
-override_dh_installinit:
-	if dpkg-vendor --derives-from ubuntu; then \
-		cp debian/samba-ad-dc.upstart.in debian/samba-ad-dc.upstart; \
-		dh_installinit --upstart-only; \
-	else \
-		dh_installinit; \
-	fi;
-
 override_dh_fixperms:
 	dh_fixperms
 ifneq (,$(filter samba-common, $(shell dh_listpackages)))
diff --git a/debian/samba-ad-dc.upstart.in b/debian/samba-ad-dc.upstart
similarity index 100%
rename from debian/samba-ad-dc.upstart.in
rename to debian/samba-ad-dc.upstart

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git