r2652 - packages/trunk/fretsonfire/debian

[Matthew Johnson]

Author: mjj29-guest
Date: 2007-05-11 18:00:25 +0000 (Fri, 11 May 2007)
New Revision: 2652

Modified:
   packages/trunk/fretsonfire/debian/changelog
   packages/trunk/fretsonfire/debian/control
   packages/trunk/fretsonfire/debian/rules
Log:
remove fonts from tarball, symlink in from other packages and depend on them


Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog	2007-05-11 14:13:39 UTC (rev 2651)
+++ packages/trunk/fretsonfire/debian/changelog	2007-05-11 18:00:25 UTC (rev 2652)
@@ -1,12 +1,13 @@
 fretsonfire (1.2.451.dfsg-1) unstable; urgency=low
 
   [ Matthew Johnson ]
-  * DFSG version/tarball (in progress)
+  * DFSG version/tarball (remove songs and fonts)
   * Add depends on python-pyogg, new version needs it
   * Add depends on fretsonfire-data-sectoid
-  * rewrite get-orig-source to use makefile targets
+  * Rewrite get-orig-source to use makefile targets
+  * Add depends on ttf-bitstream-vera and ttf-mgopen
 
- -- Matthew Johnson <debian at matthew.ath.cx>  Fri, 11 May 2007 15:10:52 +0100
+ -- Matthew Johnson <debian at matthew.ath.cx>  Fri, 11 May 2007 19:01:11 +0100
 
 fretsonfire (1.2.451-1) unstable; urgency=low
 

Modified: packages/trunk/fretsonfire/debian/control
===================================================================
--- packages/trunk/fretsonfire/debian/control	2007-05-11 14:13:39 UTC (rev 2651)
+++ packages/trunk/fretsonfire/debian/control	2007-05-11 18:00:25 UTC (rev 2652)
@@ -8,7 +8,7 @@
 
 Package: fretsonfire
 Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, python-pygame, python-opengl, python-numeric, python-imaging, python-pyogg, ${misc:Depends}, fretsonfire-data-sectoid
+Depends: ${shlibs:Depends}, ${python:Depends}, python-pygame, python-opengl, python-numeric, python-imaging, python-pyogg, ${misc:Depends}, fretsonfire-data-sectoid, ttf-bitstream-vera, ttf-mgopen
 Suggests: vorbis-tools
 Description: game of musical skill and fast fingers
  Frets on Fire is a game of musical skill and fast fingers. The aim of

Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules	2007-05-11 14:13:39 UTC (rev 2651)
+++ packages/trunk/fretsonfire/debian/rules	2007-05-11 18:00:25 UTC (rev 2652)
@@ -56,8 +56,13 @@
 	
 	# install data dir
 	install -d $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data
-	install -m644 data/*.ini data/*.svg data/*.png data/*.ogg data/*.dae data/*.ttf data/*.txt $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data
+	install -m644 data/*.ini data/*.svg data/*.png data/*.ogg data/*.dae data/*.txt $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data
 	
+	# symlink fonts
+	ln -sf ../../../fonts/truetype/ttf-bitstream-vera/Vera.ttf $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/international.ttf 
+	ln -sf ../../../fonts/truetype/ttf-mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/title.ttf
+	ln -sf ../../../fonts/truetype/ttf-mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/default.ttf
+	
 	# install translations
 	install -d $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/translations
 	install -m644 data/translations/*.mo $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/translations
@@ -139,6 +144,7 @@
 	
 	# 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
 	cp -va "FretsOnFire/data/mods" "fretsonfire-$(ORIG_VERSION).dfsg/data/"
 	cp -va "FretsOnFire/data/translations" "fretsonfire-$(ORIG_VERSION).dfsg/data/"
 	mkdir -p "fretsonfire-$(ORIG_VERSION).dfsg/data/songs"