diff options
| author | Rusty Newton <rnewton@digium.com> | 2013-10-29 23:43:58 +0000 |
|---|---|---|
| committer | Rusty Newton <rnewton@digium.com> | 2013-10-29 23:43:58 +0000 |
| commit | 74dc7983d145e075f18be81f7638de64a1ed05b9 (patch) | |
| tree | de23927068f74d2151e95cb00ce9cefa810829cb /sounds | |
| parent | 076b29dd5b51e7ec68c141d9e6c5ec8a2c63be66 (diff) | |
Updates for 1.4.25 core sounds and 1.4.14 extra sounds, plus new en_GB language set
The new sound packages relate to issues: ASTERISK-22544, ASTERISK-22411, ASTERISK-21413, ASTERISK-20782
Modified sounds/Makefile for the new sound versions and to account for the new en_GB language set.
(issue ASTERISK-22659)
(closes issue ASTERISK-22659)
(closes issue ASTERISK-22411)
(closes issue ASTERISK-22544)
........
Merged revisions 402224 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 402225 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 402226 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'sounds')
| -rw-r--r-- | sounds/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sounds/Makefile b/sounds/Makefile index 02b313410..de60ef2f4 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -19,12 +19,13 @@ CMD_PREFIX?=@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh -CORE_SOUNDS_VERSION:=1.4.24 -EXTRA_SOUNDS_VERSION:=1.4.13 +CORE_SOUNDS_VERSION:=1.4.25 +EXTRA_SOUNDS_VERSION:=1.4.14 MOH_VERSION:=2.03 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS)) MCS:=$(subst -EN_AU-,-en_AU-,$(MCS)) +MCS:=$(subst -EN_GB-,-en_GB-,$(MCS)) MCS:=$(subst -FR-,-fr-,$(MCS)) MCS:=$(subst -ES-,-es-,$(MCS)) MCS:=$(subst -RU-,-ru-,$(MCS)) @@ -139,6 +140,8 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_AU,$(CORE_SOUNDS_VERSION))) +$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en_GB,$(CORE_SOUNDS_VERSION))) + $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,es,$(CORE_SOUNDS_VERSION))) $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION))) @@ -153,6 +156,8 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,es,$(EXTRA_SOUND $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,fr,$(EXTRA_SOUNDS_VERSION))) +$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en_GB,$(EXTRA_SOUNDS_VERSION))) + $(eval $(call sound_format_lang_rule,$(MOH_DIR),moh,,$(MOH_VERSION))) dist-clean: |