[Tux4kids-commits] r103 - tuxtype/trunk/tuxtype/data/sounds

[holger at alioth.debian.org]

Author: holger
Date: 2006-07-16 19:29:54 +0000 (Sun, 16 Jul 2006)
New Revision: 103

Removed:
   tuxtype/trunk/tuxtype/data/sounds/funkbrk.it
Modified:
   tuxtype/trunk/tuxtype/data/sounds/Makefile.am
   tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT
Log:
- removed funkbrk.it as its origin is unclear and it's not used
- better wording of README_SOUNDS.TXT


Modified: tuxtype/trunk/tuxtype/data/sounds/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/Makefile.am	2006-07-16 19:02:40 UTC (rev 102)
+++ tuxtype/trunk/tuxtype/data/sounds/Makefile.am	2006-07-16 19:29:54 UTC (rev 103)
@@ -1,6 +1,5 @@
 
 EXTRA_DIST = \
-funkbrk.it\
 tuxi.ogg\
 alarm.wav\
 bite.wav\
@@ -29,8 +28,6 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
-	$(INSTALL_DATA) $(srcdir)/funkbrk.it $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/funkbrk.it
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
 	$(INSTALL_DATA) $(srcdir)/tuxi.ogg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tuxi.ogg
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
 	$(INSTALL_DATA) $(srcdir)/alarm.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/alarm.wav
@@ -82,7 +79,6 @@
 	$(INSTALL_DATA) $(srcdir)/README_SOUNDS.TXT $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/README_SOUNDS.TXT
 
 uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/funkbrk.it
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tuxi.ogg
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/alarm.wav
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/bite.wav

Modified: tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT	2006-07-16 19:02:40 UTC (rev 102)
+++ tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT	2006-07-16 19:29:54 UTC (rev 103)
@@ -1,72 +1,59 @@
 About The Sound Files Used In This Game
 ---------------------------------------
 
-Some of the sound files used in this game were made exclusively
-by myself (Sam Hart, <hart at geekcomix.com>) and I place under the
-Gnu GPL as dictated by the COPYING file in the root directory of
-this archive. Those files are:
+Some of the sound files used in this game were made exclusively by myself (Sam
+Hart, <hart at geekcomix.com>) and I place under the Gnu GPL as dictated by the
+COPYING file in the root directory of this archive. Those files are:
 
 excuseme.wav
 bite.wav
 run.wav
 splat.wav
 
-Sam got the following two files from a CD with copyright-free stuff 
-("they were sounds you could legally use to sample, remix, use 
-elsewhere, without having to get permission or any acknowledgement 
-back to the author"):
+The following files are taken from tuxmath and where made by Bill Kendrick
+<bill at newbreedsoftware.com> - the files are also place under the GPL:
 
-win.wav 	 	
-winfinal.wav
-
-
-The following files are taken from tuxmath and where made by 
-Bill Kendrick <bill at newbreedsoftware.com> - the files are also 
-place under the GPL:
-
-explosion.wav  	-> also used in tuxmath
-alarm.wav	-> also used in tuxmath
-buzz.wav	-> also used in tuxmath
 game.mod
 game2.mod
 game3.mod
 laser.wav
-lose.wav	-> also used in tuxmath
 pause.wav	
-pop.wav		-> also used in tuxmath
-shieldsdown.wav	-> also used in tuxmath
 tock.wav
-tuxi.ogg
+explosion.wav  	
+alarm.wav
+buzz.wav
+lose.wav
+pop.wav
+shieldsdown.wav
 
+Sam got the following two files from a CD with copyright-free stuff ("they were
+sounds you could legally use to sample, remix, use elsewhere, without having to
+get permission or any acknowledgement back to the author"):
 
-Problematic files:
-click.wav 		-> no clue, maybe from kde
-funkbrt.it 		-> from one of those sites
-kmus1.wav		-> from wavplace?.com (which is offline)
-kmus2.wav		-> from wavplace?.com (which is offline)
-kmus3.wav		-> from wavplace?.com (which is offline)
-kmus4.wav 		-> from wavplace?.com (which is offline)
+win.wav 	 	
+winfinal.wav
 
-The remainder files were gathered from the following sources (I
-tried out so many files that I forget where each specifically
-came from... sorry):
 
-http://www.partnersinrhyme.com/
-http://www.wavplace.com/
-http://www.wavplace2.com/
-http://www.musicloops.com/
+Emmett Plant (emmett at sonivius.com) is the author of tuxi.ogg and released it in the public domain.
 
-Each file was either declared in the public domain, or was
-allowed to be used freely in non-comercial products. This game
-is under the Gnu GPL (again, see COPYING) and is
-open-source. While this does not preclude it from being included
-in a comercial packade (such as a Linux distro) this software is
-required to be freely distributable. Thus, it is not comercial.
 
-If you have any further questions (or you feel a sound file used
-in this open-source game has a copyright conflicting enough to
-not be included with a Gnu GPL software title) please contact me
-at hart at geekcomix.com
+The following files were either declared to be in the public domain, or were allowed to be used
+freely in non-commercial products. 
 
+kmus1.wav		
+kmus2.wav
+kmus3.wav
+kmus4.wav 
+click.wav
+
+
+This game is under the Gnu GPL (again, see COPYING) and is open-source. While
+this does not preclude it from being included in a commercial packade (such as a
+Linux distro) this software is required to be freely distributable. 
+
+If you have any further questions (or you feel a sound file used in this
+open-source game has a copyright conflicting enough to not be included
+with a Gnu GPL software title) please contact me at hart at geekcomix.com
+
 Thx.
 

Deleted: tuxtype/trunk/tuxtype/data/sounds/funkbrk.it
===================================================================
(Binary files differ)