r10191 - in packages/trunk/zaz/debian: . patches

[Miriam Ruiz]

Author: miriam
Date: 2009-08-22 22:05:12 +0000 (Sat, 22 Aug 2009)
New Revision: 10191

Added:
   packages/trunk/zaz/debian/patches/
   packages/trunk/zaz/debian/patches/no_music.patch
   packages/trunk/zaz/debian/patches/series
Modified:
   packages/trunk/zaz/debian/rules
Log:
Add patches to remove music



Added: packages/trunk/zaz/debian/patches/no_music.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music.patch	                        (rev 0)
+++ packages/trunk/zaz/debian/patches/no_music.patch	2009-08-22 22:05:12 UTC (rev 10191)
@@ -0,0 +1,52 @@
+--- zaz-0.2.6.orig/data/Makefile.am
++++ zaz-0.2.6/data/Makefile.am
+@@ -20,10 +20,6 @@
+ 	player.png\
+ 	FreeSans.ttf\
+ 	FreeMonoBold.ttf\
+-	mus1.ogg\
+-	mus2.ogg\
+-	mus3.ogg\
+-	mus4.ogg\
+ 	pull.ogg\
+ 	push.ogg\
+ 	ouch.ogg\
+--- zaz-0.2.6.orig/data/Makefile.in
++++ zaz-0.2.6/data/Makefile.in
+@@ -166,10 +166,6 @@
+ 	player.png\
+ 	FreeSans.ttf\
+ 	FreeMonoBold.ttf\
+-	mus1.ogg\
+-	mus2.ogg\
+-	mus3.ogg\
+-	mus4.ogg\
+ 	pull.ogg\
+ 	push.ogg\
+ 	ouch.ogg\
+--- zaz-0.2.6.orig/src/mainmenu.cpp
++++ zaz-0.2.6/src/mainmenu.cpp
+@@ -89,8 +89,8 @@
+ 
+ void MainMenu::StartMusic()
+ {
+-    music = (Scenes::Sample *)new Scenes::StreamingOggSample("mus1.ogg");
+-    mixer->EnqueueSample(music, 100, 0, true);
++    //music = (Scenes::Sample *)new Scenes::StreamingOggSample("mus1.ogg");
++    //mixer->EnqueueSample(music, 100, 0, true);
+ }
+ 
+ void MainMenu::StopMusic()
+@@ -269,9 +269,9 @@
+         CenterMsg("Remigiusz Dybka", 43.5, font, 0.1);
+         CenterMsg("[remigiusz.dybka at gmail.com]", 41.5, font, 0.08);
+ 
+-        CenterMsg("music:", 37, font, 0.08);
+-        CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
+-        CenterMsg("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License", 32.5, font, 0.08);
++        //CenterMsg("music:", 37, font, 0.08);
++        //CenterMsg("Nine Inch Nails", 34.5, font, 0.1);
++        //CenterMsg("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License", 32.5, font, 0.08);
+ 
+ 		glLoadIdentity();                    
+ 	    glEnable(GL_TEXTURE_2D);

Added: packages/trunk/zaz/debian/patches/series
===================================================================
--- packages/trunk/zaz/debian/patches/series	                        (rev 0)
+++ packages/trunk/zaz/debian/patches/series	2009-08-22 22:05:12 UTC (rev 10191)
@@ -0,0 +1 @@
+no_music.patch

Modified: packages/trunk/zaz/debian/rules
===================================================================
--- packages/trunk/zaz/debian/rules	2009-08-22 21:51:52 UTC (rev 10190)
+++ packages/trunk/zaz/debian/rules	2009-08-22 22:05:12 UTC (rev 10191)
@@ -101,5 +101,18 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
+get-orig-source:
+	dh_testdir
+	dh_testroot
+	rm -f zaz-0.2.6.tar.gz
+	wget http://downloads.sourceforge.net/project/zaz/zaz-0.2.6.tar.gz?use_mirror=freefr
+	rm -rf zaz-0.2.6
+	tar xvfz zaz-0.2.6.tar.gz
+	rm zaz-0.2.6.tar.gz
+	# Remove CC-by-sa-nc music by Nine Inch Nails
+	rm -f zaz-0.2.6/data/mus?.ogg
+	tar cvfz ../zaz_0.2.6+dfsg1.orig.tar.gz zaz-0.2.6
+	rm -r zaz-0.2.6
+
 binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install 
+.PHONY: get-orig-source config build clean binary-indep binary-arch binary install