Merge pull request #6 from wushin/music-naming

Music naming

21 files changed, 40 insertions, 60 deletions

diff --git a/README b/README
index 1f8c3b8..e8e659f 100644
--- a/README
+++ b/README
@@ -1,46 +1,28 @@
---------------------------
-The Mana World music files
---------------------------
+THE MANA WORLD MUSIC FILES
+===============
 
-(c) 2006-2011 The Mana World Development Team
-Released under the same terms as The Mana World, the GNU GPL.
+These music files are part of The Mana World Project.
 
-In addition, "Ride of the Valkyries" is a public domain recording
-of a public domain song, taken from here:
-http://upload.wikimedia.org/wikipedia/commons/archive/2/29/20100528231037%21Richard_Wagner_-_Ride_of_the_Valkyries.ogg
-
-These music files are part of The Mana World, and released separately from the
-source release because of their size and because the set changes rarely.
+COPYING
+------------
+(c) 2006-2014 The Mana World Development Team
+Released under the same terms as The Mana World, the GNU GPL. Of which you 
+should have received a copy via downloading this package.
 
 
 INSTALLATION
+------------
+The recommended way of getting music in the ManaPlus client to work in 
+The Mana World is to check the "Download music" checkbox under the
+"Audio" tab of the Manaplus client.
 
-The recommended way of getting music is to check "Download music" under the
-"Audio" tab of the Mana client.
-
-The original instructions are preserved below. They are somewhat outdated
-(TMW branding is now separate from the Mana client, cmake is now used)
-
------
 
-When you download these music files you have probably installed TMW either
-manually or using your distribution-specific packaging system. This means that
-there is a fixed location where TMW will look for its music files. This
-location is
-
-  $prefix/share/tmw/data/music
-
-When running ./configure without parameters, the default prefix is /usr/local.
-Most distributions will install TMW with the prefix /usr. You might also have
-installed TMW to your home directory (for example when you don't have root
-access), in which case the prefix would be something like /home/user. So
-depending on this prefix, you'll have to place the music files in one of the
-following:
+AUTHORS
+------------
+Check the music-license.txt file for a list.
+In addition, "Ride of the Valkyries" is a public domain recording
+of a public domain song, taken from here:
 
-  /usr/local/share/tmw/data/music
-  /usr/share/tmw/data/music
-  /home/user/share/tmw/data/music
+http://upload.wikimedia.org/wikipedia/commons/archive/2/29/20100528231037%21Ric
+hard_Wagner_-_Ride_of_the_Valkyries.ogg
 
-But hopefully soon the tmwmusic package will actually also be available through
-your distribution-specific packaging system, in which case you don't have to be
-reading this!
diff --git a/finalman_and_yakslem-cavesong.ogg b/cavesong.ogg
index 424b967..424b967 100644
--- a/finalman_and_yakslem-cavesong.ogg
+++ b/cavesong.ogg
diff --git a/Chilling_Environment.ogg b/chilling-environment.ogg
index f41a3ba..f41a3ba 100644
--- a/Chilling_Environment.ogg
+++ b/chilling-environment.ogg
diff --git a/Clouds Calling.ogg b/clouds-calling.ogg
index 819a264..819a264 100644
--- a/Clouds Calling.ogg
+++ b/clouds-calling.ogg
diff --git a/Despair.ogg b/despair.ogg
index 3139acd..3139acd 100644
--- a/Despair.ogg
+++ b/despair.ogg
diff --git a/The Mana World - Dimonds Cove.ogg b/dimonds-cove.ogg
index 64b7b23..64b7b23 100644
--- a/The Mana World - Dimonds Cove.ogg
+++ b/dimonds-cove.ogg
diff --git a/Explorers-melody.ogg b/explorers-melody.ogg
index 355aa11..355aa11 100644
--- a/Explorers-melody.ogg
+++ b/explorers-melody.ogg
diff --git a/Faith.ogg b/faith.ogg
index 034282e..034282e 100644
--- a/Faith.ogg
+++ b/faith.ogg
diff --git a/Feline Monstrosity - Graveyard.ogg b/graveyard.ogg
index 6af0b41..6af0b41 100644
--- a/Feline Monstrosity - Graveyard.ogg
+++ b/graveyard.ogg
diff --git a/The Mana World - Ice Continent.ogg b/ice-continent.ogg
index b36e56a..b36e56a 100644
--- a/The Mana World - Ice Continent.ogg
+++ b/ice-continent.ogg
diff --git a/InquisitiveInn.ogg b/inquisitive-inn.ogg
index abba8b2..abba8b2 100644
--- a/InquisitiveInn.ogg
+++ b/inquisitive-inn.ogg
diff --git a/Magick - Real.ogg b/magick-real.ogg
index 0b43709..0b43709 100644
--- a/Magick - Real.ogg
+++ b/magick-real.ogg
diff --git a/music-license.txt b/music-license.txt
index 9e5ed7d..a7d8f11 100644
--- a/music-license.txt
+++ b/music-license.txt
@@ -1,7 +1,7 @@
 The information in this file might be incomplete or incorrect,
 since the artists weren't tracked during the first years of the project.
 If you have knowledge about some information that's missing or that
-needs a correction, please contact the tmw development team.
+needs a correction, please contact the The Mana World development team.
 
 GPLv2: Licensed under GNU General Public License version2.
 http://www.gnu.org/licenses/gpl-2.0.html
@@ -11,25 +11,23 @@ http://creativecommons.org/licenses/by-sa/3.0/
 
 (????): Unknown contributors.
 
-# Music
-# Title / File                             | Composers/artists                  | License                  | Date Created: 
-"Trouble" /  Trouble.ogg                   | Jose. S & Dakota. D (Chicka-Maria) | GPLv2, cc-sa-3           | October 2013
-"Mystique Forest" /  Mystique Forest.ogg   | Jose. S & Dakota. D (Chicka-Maria) | GPLv2, cc-sa-3           | October 2013
-The Mana World - Peace.ogg                 | Doulos                             | GPLv2,                   | 2004
-The Mana World - Snow Village.ogg          | Aasif Chaudry                      | GPLv2, cc-sa-3           | 2008
-Chilling_Environment.ogg                   | Jose. S & Dakota. D (Chicka-Maria) | GPLv2, cc-sa-3           | (????)
-Despair.ogg                                | Jose. S & Dakota. D (Chicka-Maria) | GPLv2, cc-sa-3           | (????)
-Clouds Calling.ogg                         | (????)                             | GPLv2,                   | (????)
-Explorers-melody.ogg                       | Jose. S & Dakota. D (Chicka-Maria) | GPLv2, cc-sa-3           | (????)
-Faith.ogg                                  | (????)                             | GPLv2,                   | (????)
-Feline Monstrosity - Graveyard.ogg         | (????)                             | GPLv2,                   | (????)
-finalman_and_yakslem-cavesong.ogg          | (????)                             | GPLv2,                   | (????)
-InquisitiveInn.ogg                         | Dakota. D (Chicka-Maria)           | GPLv2, cc-sa-3           | (????)
-Magick - Real.ogg                          | Aasif Chaudry                      | GPLv2, cc-sa-3           | 2003
-Night-Is-Calling.ogg                       | Jose. S & Dakota. D (Chicka-Maria) | GPLv2, cc-sa-3           | (????)
-Ride of the Valkyries - from "Die Valkyrie" /
-Richard_Wagner_-_Ride_of_the_Valkyries.ogg | American Symphony Orchestra        | CC0                      | 1921
-The Mana World - The Forest.ogg            | (????)                             | GPLv2,                   | (????)
-White-Christmas.ogg                        | Jose S. & Dakota. D (Chicka-Maria) | GPLv2, cc-sa-3           | (????)
-The Mana World - Dimonds Cove.ogg          | Aasif Chaudry                      | GPLv2, cc-sa-3           | 2008
-The Mana World - Ice Continent.ogg         | Aasif Chaudry                      | GPLv2, cc-sa-3           | 2008
+# Title / File                           | Composers/artists                         | License                  | Date Created: 
+"Trouble" /  trouble.ogg                 | Jose. S & Dakota. D (Chicka-Maria)        | GPLv2, cc-sa-3           | 2013
+"Mystique Forest" / mystique-forest.ogg  | Jose. S & Dakota. D (Chicka-Maria)        | GPLv2, cc-sa-3           | 2013
+peace.ogg                                | Doulos                                    | GPLv2,                   | 2004
+snow-village.ogg                         | Aasif Chaudry                             | GPLv2, cc-sa-3           | 2008
+chilling-Environment.ogg                 | Jose. S & Dakota. D (Chicka-Maria)        | GPLv2, cc-sa-3           | (????)
+despair.ogg                              | Jose. S & Dakota. D (Chicka-Maria)        | GPLv2, cc-sa-3           | (????)
+clouds-calling.ogg                       | (????)                                    | GPLv2,                   | (????)
+explorers-melody.ogg                     | Jose. S & Dakota. D (Chicka-Maria)        | GPLv2, cc-sa-3           | (????)
+faith.ogg                                | (????)                                    | GPLv2,                   | (????)
+graveyard.ogg                            | Feline Monstrosity                        | GPLv2,                   | (????)
+cavesong.ogg                             | finalman & yakslem                        | GPLv2,                   | (????)
+inquisitive-inn.ogg                      | Dakota. D (Chicka-Maria)                  | GPLv2, cc-sa-3           | (????)
+magick-real.ogg                          | Aasif Chaudry                             | GPLv2, cc-sa-3           | 2003
+night-is-calling.ogg                     | Jose. S & Dakota. D (Chicka-Maria)        | GPLv2, cc-sa-3           | (????)
+ride-of-the-valkyries.ogg                | Richard Wagner/American Symphony Orchestra| CC0                      | 1921
+the-forest.ogg                           | (????)                                    | GPLv2,                   | (????)
+white-christmas.ogg                      | Jose S. & Dakota. D (Chicka-Maria)        | GPLv2, cc-sa-3           | (????)
+dimonds-cove.ogg                         | Aasif Chaudry                             | GPLv2, cc-sa-3           | 2008
+ice-continent.ogg                        | Aasif Chaudry                             | GPLv2, cc-sa-3           | 2008
diff --git a/Mystique Forest.ogg b/mystique-forest.ogg
index ef13fd6..ef13fd6 100644
--- a/Mystique Forest.ogg
+++ b/mystique-forest.ogg
diff --git a/Night-Is-Calling.ogg b/night-is-calling.ogg
index b43a53a..b43a53a 100644
--- a/Night-Is-Calling.ogg
+++ b/night-is-calling.ogg
diff --git a/The Mana World - Peace.ogg b/peace.ogg
index a7a30f9..a7a30f9 100644
--- a/The Mana World - Peace.ogg
+++ b/peace.ogg
diff --git a/Richard_Wagner_-_Ride_of_the_Valkyries.ogg b/ride-of-the-valkyries.ogg
index 5e855c9..5e855c9 100644
--- a/Richard_Wagner_-_Ride_of_the_Valkyries.ogg
+++ b/ride-of-the-valkyries.ogg
diff --git a/The Mana World - Snow Village.ogg b/snow-village.ogg
index 97f5c89..97f5c89 100644
--- a/The Mana World - Snow Village.ogg
+++ b/snow-village.ogg
diff --git a/The Mana World - The Forest.ogg b/the-forest.ogg
index b8adf02..b8adf02 100644
--- a/The Mana World - The Forest.ogg
+++ b/the-forest.ogg
diff --git a/Trouble.ogg b/trouble.ogg
index 4579980..4579980 100644
--- a/Trouble.ogg
+++ b/trouble.ogg
diff --git a/White-Christmas.ogg b/white-christmas.ogg
index d9cebdd..d9cebdd 100644
--- a/White-Christmas.ogg
+++ b/white-christmas.ogg