r2853 - in packages/trunk/glest/debian: . patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2007-06-05 22:13:07 +0000 (Tue, 05 Jun 2007)
New Revision: 2853

Added:
   packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch
Modified:
   packages/trunk/glest/debian/patches/00list
   packages/trunk/glest/debian/rules
Log:
fix the used fonts; erase the symlinks only after a testing they are indeed symlinks - this broke patch editing

Modified: packages/trunk/glest/debian/patches/00list
===================================================================
--- packages/trunk/glest/debian/patches/00list	2007-06-05 21:52:33 UTC (rev 2852)
+++ packages/trunk/glest/debian/patches/00list	2007-06-05 22:13:07 UTC (rev 2853)
@@ -1,2 +1,3 @@
 05_nomapeditor.dpatch
 10_fix_gcc-4.1_particle.h.dpatch
+15_use_fixed_fonts.dpatch

Added: packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch
===================================================================
--- packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch	                        (rev 0)
+++ packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch	2007-06-05 22:13:07 UTC (rev 2853)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_use_fixed_fonts.dpatch by Eddy Petrișor <eddy.petrisor at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make the game use the fixed fonts since utopia fonts are not available
+##     on Debian, by default
+
+ at DPATCH@
+diff -urNad glest-2.0.0~/mk/linux/glest.ini glest-2.0.0/mk/linux/glest.ini
+--- glest-2.0.0~/mk/linux/glest.ini	2006-04-13 01:52:25.000000000 +0300
++++ glest-2.0.0/mk/linux/glest.ini	2007-06-06 01:06:42.000000000 +0300
+@@ -22,9 +22,9 @@
+ FogOfWar=1
+ FogOfWarSmoothing=1
+ FogOfWarSmoothingFrameSkip=3
+-FontConsole=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
+-FontDisplay=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
+-FontMenu=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
++FontConsole=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
++FontDisplay=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
++FontMenu=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
+ Lang=english.lng
+ MaxLights=1
+ PathFindNodesMax=250


Property changes on: packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/trunk/glest/debian/rules
===================================================================
--- packages/trunk/glest/debian/rules	2007-06-05 21:52:33 UTC (rev 2852)
+++ packages/trunk/glest/debian/rules	2007-06-05 22:13:07 UTC (rev 2853)
@@ -52,10 +52,11 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	cd mk/linux && jam -q clean
+	cd mk/linux && jam -q clean && cd -
 
-	rm -f mk/linux/glest_game
-	rm -f mk/linux/shared_lib
+	echo "pwd=`pwd`"
+	[ -L mk/linux/glest_game ] && rm -f mk/linux/glest_game || true
+	[ -L mk/linux/shared_lib ] && rm -f mk/linux/shared_lib || true
 	rm -fr mk/linux/build/*
 
 	dh_clean