r5767 - packages/trunk/chromium-data/debian

[Paul Wise]

Author: pabs
Date: 2008-02-15 12:07:38 +0000 (Fri, 15 Feb 2008)
New Revision: 5767

Modified:
   packages/trunk/chromium-data/debian/changelog
   packages/trunk/chromium-data/debian/copyright
   packages/trunk/chromium-data/debian/rules
Log:
* remove the non-free sounds and music and add replacement music
  by Brian Redfern (Closes: #385115)

Modified: packages/trunk/chromium-data/debian/changelog
===================================================================
--- packages/trunk/chromium-data/debian/changelog	2008-02-15 11:39:03 UTC (rev 5766)
+++ packages/trunk/chromium-data/debian/changelog	2008-02-15 12:07:38 UTC (rev 5767)
@@ -1,4 +1,4 @@
-chromium-data (0.9.12-4) UNRELEASED; urgency=low
+chromium-data (0.9.12+dfsg.1-1) UNRELEASED; urgency=low
 
   [ Barry deFreese ]
   * Add watch file
@@ -8,6 +8,8 @@
 
   [ Paul Wise ]
   * remove the Homepage from the package description
+  * remove the non-free sounds and music and add replacement music
+    by Brian Redfern (Closes: #385115)
 
  -- Jon Dowland <jon at alcopop.org>  Mon, 03 Dec 2007 17:43:18 +0000
 

Modified: packages/trunk/chromium-data/debian/copyright
===================================================================
--- packages/trunk/chromium-data/debian/copyright	2008-02-15 11:39:03 UTC (rev 5766)
+++ packages/trunk/chromium-data/debian/copyright	2008-02-15 12:07:38 UTC (rev 5767)
@@ -9,6 +9,11 @@
 
 This program is made avaiable under the Artistic Licence.
 
+The upstream sound and music was removed because they are non-free.
+
+The replacement music is Copyright 2007 Brian Redfern and
+also licenced under the Artistic Licence.
+
 On Debian systems, the complete text of the this License 
 can be found in /usr/share/common-licenses/Artistic file.
 

Modified: packages/trunk/chromium-data/debian/rules
===================================================================
--- packages/trunk/chromium-data/debian/rules	2008-02-15 11:39:03 UTC (rev 5766)
+++ packages/trunk/chromium-data/debian/rules	2008-02-15 12:07:38 UTC (rev 5767)
@@ -1,12 +1,17 @@
 #!/usr/bin/make -f
 
-build: 
-#nothing to do, but required by policy
+build:
+	# Needs adjusting if we switch away from Brian Redfern's replacement music
+	tar zxf chromium_music.tar.gz
+	mv chromium_music/chromium_menu.wav data/wav/music_menu.wav
+	mv chromium_music/chromium_music.wav data/wav/music_game.wav
+	rm -rf chromium_music 
 
 clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
+	rm -f data/wav/music_menu.wav data/wav/music_game.wav 
 
 install: build
 	dh_testdir
@@ -38,4 +43,30 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+VERSION=0.9.12
+T=chromium-data-$(VERSION)
+O=$(T).orig
+TAR=chromium-data_$(VERSION)+dfsg.1.orig.tar.gz
+
+get-orig-source:
+	wget -c http://downloads.sourceforge.net/chromium-bsu/$(T).tar.gz
+	tar zxf $(T).tar.gz
+	mv Chromium-0.9 $(T)
+	# Since we are repacking, remove CVS crap too
+	find $(T) -iname CVS -print0 | xargs --null rm -rf 
+	# Non-free or unkown copyright & licence info
+	rm -f $(T)/data/wav/*.wav  
+	# Since we are repacking, add free replacements from http://bugs.debian.org/385115
+	# The most suitable one, comes with rosegarden & zynaddsubfx source code
+        # Composed by Brian Redfern <brianwredfern at gmail.com>
+	wget -c http://www.secret49.com/chromium_music.tar.gz ; mv chromium_music.tar.gz $(T)
+	# These ones are a bit cheesy but are another alternative
+	# Composed by Daniel James <daniel at 64studio.com>
+	# wget -c http://people.64studio.com/~daniel/music-game-new.wav -O $(T)/data/wav/music_game.wav
+	# wget -c http://people.64studio.com/~daniel/music-menu-new.wav -O $(T)/data/wav/music_menu.wav
+	mv $(T) $(O) # Either policy or devref says to do this, I forget
+	tar zcf $(TAR) $(O)
+	rm -rf $(O)
+
+.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source