Convert all release tags to Opsound music-on-hold.

For more details:
http://blogs.digium.com/2009/08/18/asterisk-music-on-hold-changes/

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.4.0-beta3@212958 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CREDITS b/CREDITS
index a51638214693464f56816b01b713b5a22b15cba3..9b7713af4ad1a0983c0443e469772c03c425e9d9 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -161,7 +161,7 @@ Brian M. Clapper - poll.c emulation
        This product includes software developed by Brian M. Clapper <bmc@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.

diff --git a/UPGRADE.txt b/UPGRADE.txt
index b66ee5dfad9e8d6c0c3ee5627977e16e63db9eb3..7c867255c901b8fbb05b7db83b76b6704653573d 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -59,11 +59,11 @@ Beginning with Asterisk 1.4, the sound files and music on hold files supplied fo
 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

diff --git a/build_tools/prep_tarball b/build_tools/prep_tarball
index 6b2354e5f75495e9d5811490e3e7d2e286fe612a..fe1f2ffd4d68a0d78916b2cc2cde4ad32fdf8199 100755 (executable)
--- a/build_tools/prep_tarball
+++ b/build_tools/prep_tarball
@@ -5,4 +5,4 @@
 #
 # It will be executed from the top-level directory of the project.
 
-make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV
+make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-WAV

diff --git a/doc/00README.1st b/doc/00README.1st
index c006d56a887056ca1f2a7d9edea17c14a8139033..5fd620168f204b8c7c35c0f4c4269437eb051f77 100644 (file)
--- a/doc/00README.1st
+++ b/doc/00README.1st
@@ -34,7 +34,7 @@ ices.txt              Integrating ICEcast streaming in Asterisk
 jitterbuffer.txt       About the IAX2 jitterbuffer implementation
 math.txt               About the math() application
 mp3.txt                        About MP3 support in Asterisk
-musiconhold-fpm.txt    Free Music On Hold music
+musiconhold-opsound.txt        Free Music On Hold music
 mysql.txt              About MYSQL support in Asterisk
 odbcstorage.txt                Voicemail storage of messages in UnixODBC
 privacy.txt            Privacy enhancements in Asterisk

diff --git a/doc/musiconhold-fpm.txt b/doc/musiconhold-fpm.txt
deleted file mode 100644 (file)
index ad11c48..0000000
--- a/doc/musiconhold-fpm.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-About Hold Music
-================
-Digium has licensed the music included with
-the Asterisk distribution From FreePlayMusic
-for use and distribution with Asterisk.  It
-is licensed ONLY for use as hold music within
-an Asterisk based PBX.
-

diff --git a/doc/musiconhold-opsound.txt b/doc/musiconhold-opsound.txt
new file mode 100644 (file)
index 0000000..08c79f9
--- /dev/null
+++ b/doc/musiconhold-opsound.txt
@@ -0,0 +1,7 @@
+About Hold Music
+================
+These files were obtained from http://opsound.org, where the authors placed them
+under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which
+may be found at http://creativecommons.org.
+
+

diff --git a/sounds/Makefile b/sounds/Makefile
index 661435524bedd4417b689c5273110da8396abd4d..ad3c1880a1dabcd4294e1bee26e96ea80ab601db 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -41,7 +41,7 @@ MES:=$(subst -GSM,-gsm,$(MES))
 MES:=$(subst -G729,-g729,$(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))

diff --git a/sounds/sounds.xml b/sounds/sounds.xml
index 860207d3372444b8070b842183a778740307732d..3c3641cec6a058a30bbaa7db9f17651d9d641514 100644 (file)
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -32,16 +32,16 @@
                </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>
        </category>
        <category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">