r4819 - in packages/trunk/fretsonfire/debian: . patches

[Matthew Johnson]

Author: mjj29-guest
Date: 2007-12-01 11:08:44 +0000 (Sat, 01 Dec 2007)
New Revision: 4819

Modified:
   packages/trunk/fretsonfire/debian/patches/series
   packages/trunk/fretsonfire/debian/rules
Log:
try without patches which seem to be merged upstream


Modified: packages/trunk/fretsonfire/debian/patches/series
===================================================================
--- packages/trunk/fretsonfire/debian/patches/series	2007-12-01 05:22:44 UTC (rev 4818)
+++ packages/trunk/fretsonfire/debian/patches/series	2007-12-01 11:08:44 UTC (rev 4819)
@@ -1,4 +1,4 @@
 datapath.patch
-svg.patch
+#svg.patch
 stage.ini.patch
-typeerror.patch
+#typeerror.patch

Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules	2007-12-01 05:22:44 UTC (rev 4818)
+++ packages/trunk/fretsonfire/debian/rules	2007-12-01 11:08:44 UTC (rev 4819)
@@ -32,7 +32,7 @@
 	chmod 755 src/FretsOnFire.py
 	chmod 755 src/TestAll.py
 	chmod 755 src/svg2png.py
-
+	
 	mkdir translations
 	cp data/translations/*.po translations/
 	cp data/translations/*.py translations/
@@ -40,7 +40,7 @@
 		cp debian/translations/* translations/ ; \
 		fi
 	cd translations && python update.py
-
+	
 	touch $@
 
 clean:
@@ -70,12 +70,12 @@
 	dh_clean -k 
 	dh_installdirs
 	#python setup.py install --root=$(CURDIR)/debian/fretsonfire --no-compile --verbose
-
+	
 	# symlink fonts
 	ln -sf ../../../fonts/truetype/ttf-bitstream-vera/Vera.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/international.ttf 
 	ln -sf ../../../fonts/truetype/ttf-mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/title.ttf
 	ln -sf ../../../fonts/truetype/ttf-mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/default.ttf
-
+	
 	# other installation done with dh_install 
 
 # Build architecture-independent files here.
@@ -115,21 +115,21 @@
 	cd fretsonfire-$(ORIG_VERSION).dfsg/src && \
 		xgettext -o ../data/translations/fretsonfire.pot \
 			`grep -r "_(\".*\")" * | awk -F: '{print $$1}' | sort --unique`
-
+	
 	cat fretsonfire-$(ORIG_VERSION).dfsg/data/songs/tutorial/script.txt | \
 		awk '{ print NR "|" $$0 }' | grep " text " | sed 's/ text */|/g' | \
 		awk -F"|" '{ print "\n#: data/songs/tutorial/script.txt:" $$1 " \nmsgid \"" $$3 "\"\nmsgstr \"\""}' \
 			>> fretsonfire-$(ORIG_VERSION).dfsg/data/translations/fretsonfire.pot
-
+	
 	msguniq -o fretsonfire-$(ORIG_VERSION).dfsg/data/translations/fretsonfire.pot \
 		fretsonfire-$(ORIG_VERSION).dfsg/data/translations/fretsonfire.pot
-
+	
 	# get the source from the translation files (needs gettext)
 	cd fretsonfire-$(ORIG_VERSION).dfsg/data/translations && \
 		for i in *.mo; do \
 			msgunfmt $$i > `echo $$i | sed -e "s/.mo/.po/"` ; \
 		done
-
+	
 	# merge the obtained the translation files with the template (needs gettext)
 	cd fretsonfire-$(ORIG_VERSION).dfsg/data/translations && \
 		for i in *.po; do \
@@ -139,15 +139,15 @@
 get-orig-source: ../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz ../FretsOnFire-src-$(ORIG_VERSION).tar.gz
 	# clean old builds;
 	rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg"
-
+	
 	# extract source and data
 	tar xvfz "../FretsOnFire-src-$(ORIG_VERSION).tar.gz"
 	tar xvfz "../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz"
-
+	
 	# we want all the source 
 	mv "FretsOnFire-src-$(ORIG_VERSION)" "fretsonfire-$(ORIG_VERSION).dfsg"
 	mkdir -p "fretsonfire-$(ORIG_VERSION).dfsg/data"
-
+	
 	# copy the data, without the songs, but with the tutorial
 	cp -v "FretsOnFire/data"/* "fretsonfire-$(ORIG_VERSION).dfsg/data/" || true
 	rm -f "fretsonfire-$(ORIG_VERSION).dfsg/data"/*.ttf
@@ -155,15 +155,15 @@
 	cp -va "FretsOnFire/data/translations" "fretsonfire-$(ORIG_VERSION).dfsg/data/"
 	mkdir -p "fretsonfire-$(ORIG_VERSION).dfsg/data/songs"
 	cp -av "FretsOnFire/data/songs/tutorial" "fretsonfire-$(ORIG_VERSION).dfsg/data/songs/"
-
+	
 	# get translation sources (requires subversion)
 	svn co https://fretsonfire.svn.sourceforge.net/svnroot/fretsonfire/trunk/data/translations _translations
 	mv _translations/* "fretsonfire-$(ORIG_VERSION).dfsg/data/translations/"
 	rm -rf _translations
-
+	
 	# turn off the execute bit on all the random files
 	find "fretsonfire-$(ORIG_VERSION).dfsg" -type f | xargs chmod -x
-
+	
 	# build the tarball and clean up
 	tar cvfz "../fretsonfire_$(ORIG_VERSION).dfsg.orig.tar.gz" "fretsonfire-$(ORIG_VERSION).dfsg"
 	rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg"