diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/asterisk | |
parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) |
resolve merge conflict
Diffstat (limited to 'package/asterisk')
-rw-r--r-- | package/asterisk/Makefile | 4 | ||||
-rw-r--r-- | package/asterisk/files/asterisk.conffiles | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 595bae027..425683f24 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -26,13 +26,15 @@ PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol PKG_DESCR_CODEC_SPEEX:= Speex/PCM16 Codec Translator +PKG_DESCR_SOUNDS:= Various soundfiles in GSM format +PKG_DEPENDS_SOUNDS:= ${PKG_DEPENDS} asterisk-codec-gsm include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_SOUNDS},${PKG_DESCR_SOUNDS},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION})) diff --git a/package/asterisk/files/asterisk.conffiles b/package/asterisk/files/asterisk.conffiles index 2cb705f9c..55949fde7 100644 --- a/package/asterisk/files/asterisk.conffiles +++ b/package/asterisk/files/asterisk.conffiles @@ -13,7 +13,6 @@ /etc/asterisk/modules.conf /etc/asterisk/musiconhold.conf /etc/asterisk/osp.conf -/etc/asterisk/privacy.conf /etc/asterisk/queues.conf /etc/asterisk/rtp.conf /etc/asterisk/sip.conf |