[Pkg-voip-commits] [asterisk] 05/05: Fix systemd support

[tzafrir at debian.org]

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

tzafrir pushed a commit to branch master
in repository asterisk.

commit cfe9138d5a3149a0341e8feaf146ad5c9bcde707
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sun Oct 26 09:59:04 2014 +0200

    Fix systemd support
---
 debian/asterisk.examples     | 1 +
 debian/asterisk.install      | 1 +
 debian/patches/systemd.patch | 8 ++++----
 debian/rules                 | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/asterisk.examples b/debian/asterisk.examples
index 8bbcedc..875e623 100644
--- a/debian/asterisk.examples
+++ b/debian/asterisk.examples
@@ -1,3 +1,4 @@
 sample.call
 contrib/scripts/vmail.cgi
 debian/asterisk.startup.conf
+contrib/scripts/asterisk_cleanup
diff --git a/debian/asterisk.install b/debian/asterisk.install
index cce3b9b..976f49c 100644
--- a/debian/asterisk.install
+++ b/debian/asterisk.install
@@ -3,3 +3,4 @@ usr/share/asterisk/firmware
 usr/share/asterisk/keys
 usr/share/asterisk/conf
 usr/share/asterisk/documentation
+lib/systemd/system/asterisk.service
diff --git a/debian/patches/systemd.patch b/debian/patches/systemd.patch
index d11e4b5..b1ec4c6 100644
--- a/debian/patches/systemd.patch
+++ b/debian/patches/systemd.patch
@@ -165,12 +165,12 @@ Index: trunk/Makefile
 ===================================================================
 --- trunk/Makefile	(revision 407855)
 +++ trunk/Makefile	(working copy)
-@@ -783,6 +783,8 @@
+@@ -791,6 +791,8 @@
  
  config:
  	@if [ "${OSARCH}" = "linux-gnu" ]; then \
 +		$(INSTALL) -d $(DESTDIR)/lib/systemd/system; \
-+		./build_tools/install_subst -d contrib/asterisk.service $(DESTDIR)/lib/systemd/system/;
++		./build_tools/install_subst -d contrib/asterisk.service $(DESTDIR)/lib/systemd/system/asterisk.service; \
  		if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
- 			cat contrib/init.d/rc.redhat.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
- 			$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/init.d/asterisk" ; \
+ 			./build_tools/install_subst contrib/init.d/rc.redhat.asterisk  "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \
+ 			if [ ! -f "$(DESTDIR)/etc/sysconfig/asterisk" ] ; then \
diff --git a/debian/rules b/debian/rules
index 65fe090..a1a9163 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,7 +124,7 @@ SUBPACKS_EXTRA_DIRS = $(SUBPACKS_EXTRA:%=$(CURDIR)/debian/asterisk-%)
 SUBPACKS_EXTRA_DIRS_MOD = $(SUBPACKS_EXTRA_DIRS:%=%/usr/lib/asterisk/modules)
 
 override_dh_auto_install:
-	$(FETCH_ENV) dh_auto_install -- $(BUILDFLAGS) samples
+	$(FETCH_ENV) dh_auto_install -- $(BUILDFLAGS) config samples
 	cp -a configs $(CURDIR)/debian/tmp/usr/share/asterisk/conf
 	$(RM) -f $(CURDIR)/debian/tmp/usr/sbin/conf2ael
 	$(RM) -f $(CURDIR)/debian/tmp/usr/sbin/muted

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