提交 f705ae23 authored 作者: William King's avatar William King

Merge pull request #825 in FS/freeswitch from…

Merge pull request #825 in FS/freeswitch from ~SSINYAGIN/freeswitch:bugfix/FS-9075-debian-package-freeswitch-all-incompatible to master

* commit 'ce6af250':
  FS-9075 fixup for systemd and sysvinit
...@@ -1286,16 +1286,11 @@ map_modules "mod_filter" \ ...@@ -1286,16 +1286,11 @@ map_modules "mod_filter" \
"gencontrol_per_cat" \ "gencontrol_per_cat" \
"gencontrol_per_mod geninstall_per_mod genoverrides_per_mod" "gencontrol_per_mod geninstall_per_mod genoverrides_per_mod"
##### Not sure if this is needed at all... if this is supposed to be included somewhere it should be for just the freeswitch package if [ ${use_sysvinit} = "true" ]; then
#if [ ${use_sysvinit} = "true" ]; then echo -n freeswitch-sysvinit >freeswitch-init.provided_by
# cp -a freeswitch-sysvinit.freeswitch.init freeswitch-all.freeswitch.init else
# cp -a freeswitch-sysvinit.freeswitch.default freeswitch-all.freeswitch.default echo -n freeswitch-systemd >freeswitch-init.provided_by
# echo -n freeswitch-sysvinit >freeswitch-init.provided_by fi
#else
# cp -a freeswitch-systemd.freeswitch.service freeswitch-all.freeswitch.service
# cp -a freeswitch-systemd.freeswitch.tmpfile freeswitch-all.freeswitch.tmpfile
# echo -n freeswitch-systemd >freeswitch-init.provided_by
#fi
echo "Generating additional lintian overrides..." >&2 echo "Generating additional lintian overrides..." >&2
......
...@@ -100,6 +100,14 @@ override_dh_auto_install: ...@@ -100,6 +100,14 @@ override_dh_auto_install:
dh_auto_install -- -C libs/esl pymod-install dh_auto_install -- -C libs/esl pymod-install
rm -f debian/tmp/usr/share/freeswitch/grammar/model/communicator/COPYING rm -f debian/tmp/usr/share/freeswitch/grammar/model/communicator/COPYING
override_dh_installinit:
if [ `cat debian/freeswitch-init.provided_by` = freeswitch-systemd ]; then \
dh_systemd_enable -pfreeswitch-systemd --name=freeswitch; \
dh_systemd_start -pfreeswitch-systemd --name=freeswitch; \
else \
dh_installinit -pfreeswitch-sysvinit --name=freeswitch; \
fi
debian-bootstrap: debian/.stamp-bootstrap debian-bootstrap: debian/.stamp-bootstrap
debian/.stamp-bootstrap: debian/.stamp-bootstrap:
(cd debian && ./bootstrap.sh) (cd debian && ./bootstrap.sh)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论