aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-18 20:42:51 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-18 20:42:51 +0000
commita9f28417c664d88e021e481b4b81cf1b10af63ff (patch)
treedfae9d970ce9fc71f0aed7d1ebd896c6a3949867
parent374592f2e6b7faa2475a719d1d5f251712a6b757 (diff)
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.0.11@212958 f38db490-d61c-443f-a65b-d21fe96a405bv1.0.11
-rw-r--r--CREDITS2
-rw-r--r--ChangeLog2
-rw-r--r--README.fpm8
-rw-r--r--README.opsound22
-rw-r--r--sounds/fpm-calm-river.mp3bin1939812 -> 0 bytes
-rw-r--r--sounds/fpm-sunshine.mp3bin2582496 -> 0 bytes
-rw-r--r--sounds/fpm-world-mix.mp3bin2217563 -> 0 bytes
-rw-r--r--sounds/macroform-cold_day.mp3bin0 -> 5329576 bytes
-rw-r--r--sounds/macroform-robot_dity.mp3bin0 -> 4067300 bytes
-rw-r--r--sounds/macroform-the_simplicity.mp3bin0 -> 6687558 bytes
-rw-r--r--sounds/manolo_camp-morning_coffee.mp3bin0 -> 2343059 bytes
-rw-r--r--sounds/reno_project-system.mp3bin0 -> 7586772 bytes
12 files changed, 24 insertions, 10 deletions
diff --git a/CREDITS b/CREDITS
index 11552bdec..e9664b72e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -65,7 +65,7 @@ Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
John Todd - Monkey sounds and associated teletorture prompt
=== HOLD MUSIC ===
-Music provided by www.freeplaymusic.com
+Music provided by www.opsound.org
=== OTHER SOURCE CODE IN ASTERISK ===
diff --git a/ChangeLog b/ChangeLog
index 5730c8ffc..b1f88c49f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -283,7 +283,7 @@ Asterisk 1.0-RC2
-- Additional CDR backends
-- Allow muted to reconnect
-- Call parking improvements (including SIP parking support)
- -- Added licensed hold music from FreePlayMusic
+ -- Added licensed hold music from opsound.org
-- GR-303 and Zap improvements
-- More bug fixes from the bug tracker
-- Improved FreeBSD/OpenBSD/MacOS X support
diff --git a/README.fpm b/README.fpm
deleted file mode 100644
index ad11c4815..000000000
--- a/README.fpm
+++ /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/README.opsound b/README.opsound
new file mode 100644
index 000000000..99a59f88b
--- /dev/null
+++ b/README.opsound
@@ -0,0 +1,22 @@
+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.
+
+Credits
+================
+macroform-cold_day - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-robot_dity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-the_simplicity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+manolo_camp-morning_coffee - Manolo Camp
+beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp
+
+reno_project-system - Reno Project
+renoproject@hotmail.com - http://www.jamendo.com/en/album/23661
diff --git a/sounds/fpm-calm-river.mp3 b/sounds/fpm-calm-river.mp3
deleted file mode 100644
index 8d93b2900..000000000
--- a/sounds/fpm-calm-river.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/fpm-sunshine.mp3 b/sounds/fpm-sunshine.mp3
deleted file mode 100644
index 106953307..000000000
--- a/sounds/fpm-sunshine.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/fpm-world-mix.mp3 b/sounds/fpm-world-mix.mp3
deleted file mode 100644
index 7d1e76d9f..000000000
--- a/sounds/fpm-world-mix.mp3
+++ /dev/null
Binary files differ
diff --git a/sounds/macroform-cold_day.mp3 b/sounds/macroform-cold_day.mp3
new file mode 100644
index 000000000..63e3aa6d5
--- /dev/null
+++ b/sounds/macroform-cold_day.mp3
Binary files differ
diff --git a/sounds/macroform-robot_dity.mp3 b/sounds/macroform-robot_dity.mp3
new file mode 100644
index 000000000..b90139e99
--- /dev/null
+++ b/sounds/macroform-robot_dity.mp3
Binary files differ
diff --git a/sounds/macroform-the_simplicity.mp3 b/sounds/macroform-the_simplicity.mp3
new file mode 100644
index 000000000..850e49119
--- /dev/null
+++ b/sounds/macroform-the_simplicity.mp3
Binary files differ
diff --git a/sounds/manolo_camp-morning_coffee.mp3 b/sounds/manolo_camp-morning_coffee.mp3
new file mode 100644
index 000000000..a9d1c0f5a
--- /dev/null
+++ b/sounds/manolo_camp-morning_coffee.mp3
Binary files differ
diff --git a/sounds/reno_project-system.mp3 b/sounds/reno_project-system.mp3
new file mode 100644
index 000000000..748c4c508
--- /dev/null
+++ b/sounds/reno_project-system.mp3
Binary files differ