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

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon Oct 18 17:14:05 2010
New Revision: 292231

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

................
  r292225 | lmadsen | 2010-10-18 16:51:23 -0500 (Mon, 18 Oct 2010) | 24 lines
  
  Merged revisions 292224 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r292224 | lmadsen | 2010-10-18 16:50:47 -0500 (Mon, 18 Oct 2010) | 17 lines
    
    Merged revisions 292222 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r292222 | lmadsen | 2010-10-18 16:47:25 -0500 (Mon, 18 Oct 2010) | 9 lines
      
      Add support for the new English (Australian Accent) sound files.
      
      
      (closes issue #17426)
      Reported by: camsown
      Patches:
            core-sounds-en_AU.txt uploaded by camsown (license 1050)
            add_AU_sounds.patch.txt uploaded by lmadsen (license 10)
      Tested by: camsown, lmadsen, jtodd, qwell
    ........
  ................
................

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=292231&r1=292230&r2=292231
==============================================================================
--- trunk/sounds/Makefile (original)
+++ trunk/sounds/Makefile Mon Oct 18 17:14:05 2010
@@ -19,11 +19,12 @@
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.19
+CORE_SOUNDS_VERSION:=1.4.20
 EXTRA_SOUNDS_VERSION:=1.4.11
 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 -FR-,-fr-,$(MCS))
 MCS:=$(subst -ES-,-es-,$(MCS))
 MCS:=$(subst -WAV,-wav,$(MCS))
@@ -143,13 +144,15 @@
 		echo "***                                            ***"; \
 		echo "*** Please install one of these, or remove any ***"; \
 		echo "*** extra sound package selections in          ***"; \
-		echo "*** menuselecct before installing Asterisk.    ***"; \
+		echo "*** menuselect before installing Asterisk.     ***"; \
 		echo "***                                            ***"; \
 		echo "**************************************************"; \
 		exit 1; \
 	fi
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_VERSION)))
+
+$(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,es,$(CORE_SOUNDS_VERSION)))
 
@@ -172,10 +175,10 @@
 dist-clean:
 	rm -f *.tar.gz
 
-$(SOUNDS_DIR)/en $(MOH_DIR) $(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_CACHE_DIR):
 	$(INSTALL) -d $@
 
-install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: $(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)
 
 uninstall:
 	rm -rf $(SOUNDS_DIR)

Modified: trunk/sounds/sounds.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/sounds/sounds.xml?view=diff&rev=292231&r1=292230&r2=292231
==============================================================================
--- trunk/sounds/sounds.xml (original)
+++ trunk/sounds/sounds.xml Mon Oct 18 17:14:05 2010
@@ -53,6 +53,24 @@
 		<member name="CORE-SOUNDS-FR-SIREN7" displayname="French, G.722.1 (Siren7) format">
 		</member>
 		<member name="CORE-SOUNDS-FR-SIREN14" displayname="French, G.722.1C (Siren14) format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-WAV" displayname="English (Australian Accent), WAV format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-ULAW" displayname="English (Australian Accent), mu-Law format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-ALAW" displayname="English (Australian Accent), a-Law format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-GSM" displayname="English (Australian Accent), GSM format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-G729" displayname="English (Australian Accent), G.729 format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-G722" displayname="English (Australian Accent), G.722 format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-SLN16" displayname="English (Australian Accent), Signed-linear 16kHz format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-SIREN7" displayname="English (Australian Accent), G.722.1 (Siren7) format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format">
 		</member>
 	</category>
 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">