[svn-commits] kpfleming: branch 1.6.1 r212928 - in /branches/1.6.1: ./ build_tools/ doc/tex...

Tue Aug 18 15:31:22 CDT 2009

Author: kpfleming
Date: Tue Aug 18 15:31:18 2009
New Revision: 212928

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=212928
Log:
Merged revisions 212922 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r212922 | kpfleming | 2009-08-18 15:29:37 -0500 (Tue, 18 Aug 2009) | 6 lines
  
  Convert this branch to Opsound music-on-hold.
  
  For more details:
  http://blogs.digium.com/2009/08/18/asterisk-music-on-hold-changes/
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/CREDITS
    branches/1.6.1/UPGRADE-1.4.txt
    branches/1.6.1/build_tools/prep_tarball
    branches/1.6.1/doc/tex/asterisk.tex
    branches/1.6.1/sounds/Makefile
    branches/1.6.1/sounds/sounds.xml

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
    automerge = *

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
    automerge-email = kpfleming at digium.com

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-212909

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/CREDITS
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/CREDITS?view=diff&rev=212928&r1=212927&r2=212928
==============================================================================

--- branches/1.6.1/CREDITS (original)
+++ branches/1.6.1/CREDITS Tue Aug 18 15:31:18 2009
@@ -201,7 +201,7 @@
 	This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
 
 === HOLD MUSIC ===
-Music provided by www.freeplaymusic.com
+Music provided by www.opsound.org
 
 === OTHER SOURCE CODE IN ASTERISK ===
 Asterisk uses libedit, the lightweight readline replacement from NetBSD.

Modified: branches/1.6.1/UPGRADE-1.4.txt
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/UPGRADE-1.4.txt?view=diff&rev=212928&r1=212927&r2=212928
==============================================================================
--- branches/1.6.1/UPGRADE-1.4.txt (original)
+++ branches/1.6.1/UPGRADE-1.4.txt Tue Aug 18 15:31:18 2009
@@ -74,11 +74,11 @@
 use with Asterisk have been replaced with new versions produced from high quality
 master recordings, and are available in three languages (English, French and
 Spanish) and in five formats (WAV (uncompressed), mu-Law, a-Law, GSM and G.729).
-In addition, the music on hold files provided by FreePlay Music are now available
+In addition, the music on hold files provided by opsound.org Music are now available
 in the same five formats, but no longer available in MP3 format.
 
 The Asterisk 1.4 tarball packages will only include English prompts in GSM format,
-(as were supplied with previous releases) and the FreePlay MOH files in WAV format.
+(as were supplied with previous releases) and the opsound.org MOH files in WAV format.
 All of the other variations can be installed by running 'make menuselect' and
 selecting the packages you wish to install; when you run 'make install', those
 packages will be downloaded and installed along with the standard files included

Modified: branches/1.6.1/build_tools/prep_tarball
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/build_tools/prep_tarball?view=diff&rev=212928&r1=212927&r2=212928
==============================================================================
--- branches/1.6.1/build_tools/prep_tarball (original)
+++ branches/1.6.1/build_tools/prep_tarball Tue Aug 18 15:31:18 2009
@@ -5,7 +5,7 @@
 #
 # It will be executed from the top-level directory of the project.
 
-make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget all
+make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-WAV WGET=wget DOWNLOAD=wget all
 make AWK=awk GREP=grep menuselect-tree
 
 make_tex_docs() {

Modified: branches/1.6.1/doc/tex/asterisk.tex
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/doc/tex/asterisk.tex?view=diff&rev=212928&r1=212927&r2=212928
==============================================================================
--- branches/1.6.1/doc/tex/asterisk.tex (original)
+++ branches/1.6.1/doc/tex/asterisk.tex Tue Aug 18 15:31:18 2009
@@ -48,7 +48,7 @@
   \input{../../LICENSE}
      \subsection{Hold Music}
        Digium has licensed the music included with
-       the Asterisk distribution From FreePlayMusic
+       the Asterisk distribution From opsound.org
        for use and distribution with Asterisk.  It
        is licensed ONLY for use as hold music within
        an Asterisk based PBX.

Modified: branches/1.6.1/sounds/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/sounds/Makefile?view=diff&rev=212928&r1=212927&r2=212928
==============================================================================
--- branches/1.6.1/sounds/Makefile (original)
+++ branches/1.6.1/sounds/Makefile Tue Aug 18 15:31:18 2009
@@ -44,7 +44,7 @@
 MES:=$(subst -SLN16,-sln16,$(MES))
 EXTRA_SOUNDS:=$(MES:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz)
 EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
-MM:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
+MM:=$(subst -OPSOUND-,-opsound-,$(MENUSELECT_MOH))
 MM:=$(subst -WAV,-wav,$(MM))
 MM:=$(subst -ULAW,-ulaw,$(MM))
 MM:=$(subst -ALAW,-alaw,$(MM))

Modified: branches/1.6.1/sounds/sounds.xml
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/sounds/sounds.xml?view=diff&rev=212928&r1=212927&r2=212928
==============================================================================
--- branches/1.6.1/sounds/sounds.xml (original)
+++ branches/1.6.1/sounds/sounds.xml Tue Aug 18 15:31:18 2009
@@ -44,20 +44,20 @@
 		</member>
 	</category>
 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
-		<member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
+		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
 			<defaultenabled>yes</defaultenabled>
 		</member>
-		<member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
+		<member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music On Hold Files, mu-Law format" >
 		</member>
-		<member name="MOH-FREEPLAY-ALAW" displayname="FreePlay Music On Hold Files, a-Law format" >
+		<member name="MOH-OPSOUND-ALAW" displayname="opsound.org Music On Hold Files, a-Law format" >
 		</member>
-		<member name="MOH-FREEPLAY-GSM" displayname="FreePlay Music On Hold Files, GSM format" >
+		<member name="MOH-OPSOUND-GSM" displayname="opsound.org Music On Hold Files, GSM format" >
 		</member>
-		<member name="MOH-FREEPLAY-G729" displayname="FreePlay Music On Hold Files, G.729 format" >
+		<member name="MOH-OPSOUND-G729" displayname="opsound.org Music On Hold Files, G.729 format" >
 		</member>
-		<member name="MOH-FREEPLAY-G722" displayname="FreePlay Music On Hold Files, G.722 format" >
+		<member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
 		</member>
-		<member name="MOH-FREEPLAY-SLN16" displayname="FreePlay Music On Hold Files, Signed-linear 16kHz format" >
+		<member name="MOH-OPSOUND-SLN16" displayname="opsound.org Music On Hold Files, Signed-linear 16kHz format" >
 		</member>
 	</category>
 	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">


