[asterisk-commits] lmadsen: trunk r315766 - in /trunk: ./ sounds/Makefile sounds/sounds.xml

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Apr 27 07:37:13 2011
New Revision: 315766

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=315766
Log:
Merged revisions 315765 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r315765 | lmadsen | 2011-04-27 07:36:17 -0500 (Wed, 27 Apr 2011) | 4 lines
  
  Enable Russian core sound selection in menuselect.
  
  (closes issue #18724)
  Reported by: pbxware
........

Modified:
    trunk/   (props changed)
    trunk/sounds/Makefile
    trunk/sounds/sounds.xml

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/Makefile?view=diff&rev=315766&r1=315765&r2=315766
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Wed Apr 27 07:37:13 2011
@@ -28,7 +28,7 @@
 SOUNDS_DIR:=$(DESTDIR)$(TMPDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
 MOH_DIR:=$(DESTDIR)$(TMPDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.20
+CORE_SOUNDS_VERSION:=1.4.21
 EXTRA_SOUNDS_VERSION:=1.4.11
 MOH_VERSION:=2.03
 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases
@@ -36,6 +36,7 @@
 MCS:=$(subst -EN_AU-,-en_AU-,$(MCS))
 MCS:=$(subst -FR-,-fr-,$(MCS))
 MCS:=$(subst -ES-,-es-,$(MCS))
+MCS:=$(subst -RU-,-ru-,$(MCS))
 MCS:=$(subst -WAV,-wav,$(MCS))
 MCS:=$(subst -ULAW,-ulaw,$(MCS))
 MCS:=$(subst -ALAW,-alaw,$(MCS))
@@ -173,6 +174,8 @@
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION)))
 
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ru,$(CORE_SOUNDS_VERSION)))
+
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en,$(EXTRA_SOUNDS_VERSION)))
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,es,$(EXTRA_SOUNDS_VERSION)))
@@ -190,10 +193,10 @@
 dist-clean:
 	rm -f *.tar.gz
 
-$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
+$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(SOUNDS_CACHE_DIR):
 	mkdir -p $@
 
-install: prefixcmd $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: prefixcmd $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
 
 uninstall:
 	rm -rf $(SOUNDS_DIR)

Modified: trunk/sounds/sounds.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/sounds.xml?view=diff&rev=315766&r1=315765&r2=315766
==============================================================================
--- trunk/sounds/sounds.xml (original)
+++ trunk/sounds/sounds.xml Wed Apr 27 07:37:13 2011
@@ -72,6 +72,24 @@
 		</member>
 		<member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format">
 		</member>
+		<member name="CORE-SOUNDS-RU-WAV" displayname="Russian, WAV format">
+		</member>
+		<member name="CORE-SOUNDS-RU-ULAW" displayname="Russian, mu-Law format">
+		</member>
+		<member name="CORE-SOUNDS-RU-ALAW" displayname="Russian, a-Law format">
+		</member>
+		<member name="CORE-SOUNDS-RU-GSM" displayname="Russian, GSM format" >
+		</member>
+		<member name="CORE-SOUNDS-RU-G729" displayname="Russian, G.729 format">
+		</member>
+		<member name="CORE-SOUNDS-RU-G722" displayname="Russian, G.722 format">
+		</member>
+		<member name="CORE-SOUNDS-RU-SLN16" displayname="Russian, Signed-linear 16kHz format">
+		</member>
+		<member name="CORE-SOUNDS-RU-SIREN7" displayname="Russian, G.722.1 (Siren7) format">
+		</member>
+		<member name="CORE-SOUNDS-RU-SIREN14" displayname="Russian, G.722.1C (Siren14) format">
+		</member>
 	</category>
 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
 		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >