From dff3671f092a0bfd1c4f05ea4e39d60f70b5940f Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 6 Mar 2008 04:46:17 +0000 Subject: [PATCH] Merged revisions 106329 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r106329 | tilghman | 2008-03-05 22:45:16 -0600 (Wed, 05 Mar 2008) | 10 lines Merged revisions 106328 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r106328 | tilghman | 2008-03-05 22:40:06 -0600 (Wed, 05 Mar 2008) | 2 lines Upgrade to the next release of sounds ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106330 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- sounds/Makefile | 3 ++- sounds/sounds.xml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sounds/Makefile b/sounds/Makefile index a31dcb2cfe..5ea2beebed 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -17,7 +17,7 @@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh -CORE_SOUNDS_VERSION:=1.4.8 +CORE_SOUNDS_VERSION:=1.4.9 EXTRA_SOUNDS_VERSION:=1.4.7 SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS)) @@ -29,6 +29,7 @@ MCS:=$(subst -ALAW,-alaw,$(MCS)) MCS:=$(subst -GSM,-gsm,$(MCS)) MCS:=$(subst -G729,-g729,$(MCS)) MCS:=$(subst -G722,-g722,$(MCS)) +MCS:=$(subst -SLN16,-sln16,$(MCS)) CORE_SOUNDS:=$(MCS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz) CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION)) MES:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS)) diff --git a/sounds/sounds.xml b/sounds/sounds.xml index 4ba16e092d..ffcf11f19d 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -12,6 +12,8 @@ + + @@ -24,6 +26,8 @@ + + @@ -36,6 +40,8 @@ + +