[asterisk-commits] [svn-commits] tilghman: branch 1.6.0 r106330 - in /branches/1.6.0: ./ sounds/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Mar  5 22:46:17 2008
New Revision: 106330

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106330
Log:
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

.......

...............

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/sounds/Makefile
    branches/1.6.0/sounds/sounds.xml

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Mar  5 22:46:17 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329

Modified: branches/1.6.0/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/sounds/Makefile?view=diff&rev=106330&r1=106329&r2=106330
==============================================================================
--- branches/1.6.0/sounds/Makefile (original)
+++ branches/1.6.0/sounds/Makefile Wed Mar  5 22:46:17 2008
@@ -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 -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))

Modified: branches/1.6.0/sounds/sounds.xml
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/sounds/sounds.xml?view=diff&rev=106330&r1=106329&r2=106330
==============================================================================
--- branches/1.6.0/sounds/sounds.xml (original)
+++ branches/1.6.0/sounds/sounds.xml Wed Mar  5 22:46:17 2008
@@ -12,6 +12,8 @@
 		</member>
 		<member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
 		</member>
+		<member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
+		</member>
 		<member name="CORE-SOUNDS-ES-WAV" displayname="Spanish, WAV format">
 		</member>
 		<member name="CORE-SOUNDS-ES-ULAW" displayname="Spanish, mu-Law format">
@@ -24,6 +26,8 @@
 		</member>
 		<member name="CORE-SOUNDS-ES-G722" displayname="Spanish, G.722 format">
 		</member>
+		<member name="CORE-SOUNDS-ES-SLN16" displayname="Spanish, Signed-linear 16kHz format">
+		</member>
 		<member name="CORE-SOUNDS-FR-WAV" displayname="French, WAV format">
 		</member>
 		<member name="CORE-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
@@ -35,6 +39,8 @@
 		<member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format">
 		</member>
 		<member name="CORE-SOUNDS-FR-G722" displayname="French, G.722 format">
+		</member>
+		<member name="CORE-SOUNDS-FR-SLN16" displayname="French, Signed-linear 16kHz format">
 		</member>
 	</category>
 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">


_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--

svn-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/svn-commits