r5630 - packages/trunk/enemylines3/debian/patches

[Gonéri LE BOUDER]

Author: goneri-guest
Date: 2008-02-03 15:37:54 +0000 (Sun, 03 Feb 2008)
New Revision: 5630

Added:
   packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff
Removed:
   packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff
Modified:
   packages/trunk/enemylines3/debian/patches/series
Log:
rename the patch use_ttf-dejavu_from_debian.diff

Modified: packages/trunk/enemylines3/debian/patches/series
===================================================================
--- packages/trunk/enemylines3/debian/patches/series	2008-02-03 15:34:35 UTC (rev 5629)
+++ packages/trunk/enemylines3/debian/patches/series	2008-02-03 15:37:54 UTC (rev 5630)
@@ -1,4 +1,4 @@
 01_data_in_usr_share
 02_fix_gcc4.1.patch
 fix_gcc4.3.patch
-use_bitstream-vera_from_debian.diff
+use_ttf-dejavu_from_debian.diff

Deleted: packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff
===================================================================
--- packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff	2008-02-03 15:34:35 UTC (rev 5629)
+++ packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff	2008-02-03 15:37:54 UTC (rev 5630)
@@ -1,61 +0,0 @@
-Index: enemylines3-1.2/main.cc
-===================================================================
---- enemylines3-1.2.orig/main.cc	2007-05-14 23:00:24.000000000 +0200
-+++ enemylines3-1.2/main.cc	2007-05-14 23:00:24.000000000 +0200
-@@ -63,24 +63,10 @@
- }
- void load_font(std::string dir) {
- 	std::string path;
--	if (dir=="") {
--		path="data/";
--		std::cout << "  Looking in " << path << std::endl;
--		if (Font::load(path)) return;
--		
--		path="/usr/local/share/";
--		path+=PATHNAME;
--		path+="/";
--		std::cout << "  Looking in " << path << std::endl;
--		if (Font::load(path)) return;
--
--		path="/usr/share/";
--		path+=PATHNAME;
--		path+="/";
--		std::cout << "  Looking in " << path << std::endl;
--		if (Font::load(path)) return;
- 
--	}
-+  path="/usr/share/fonts/truetype/ttf-dejavu/";
-+  std::cout << "  Looking in " << path << std::endl;
-+  if (Font::load(path)) return;
- 
- 	if (Font::load(dir)) return;
- 	std::cerr << "  Font file not found ... Using fallback." << std::endl;
-Index: enemylines3-1.2/font.cc
-===================================================================
---- enemylines3-1.2.orig/font.cc	2007-05-14 23:00:23.000000000 +0200
-+++ enemylines3-1.2/font.cc	2007-05-14 23:01:18.000000000 +0200
-@@ -25,20 +25,20 @@
- 		return true;
- 	#endif
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",11);
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11);
- 	if (dl==0) return false;
- 	Font_ogl::init_font(0,dl,6,11);
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",22);
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22);
- 	if (dl==0) return false;
- 	Font_ogl::init_font(1,dl,14,22);
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",22,C3(250,0,0));
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22,C3(250,0,0));
- 	if (dl==0) return false;
- 	Font_ogl::init_font(2,dl,14,22);
- 
- 
--	dl=Font_ttf::gen_dl(path+"font.ttf",11,C3(255,255,0));
-+	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11,C3(255,255,0));
- 	if (dl==0) return false;
- 	Font_ogl::init_font(3,dl,6,11);
- 

Copied: packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff (from rev 5629, packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff)
===================================================================
--- packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff	                        (rev 0)
+++ packages/trunk/enemylines3/debian/patches/use_ttf-dejavu_from_debian.diff	2008-02-03 15:37:54 UTC (rev 5630)
@@ -0,0 +1,61 @@
+Index: enemylines3-1.2/main.cc
+===================================================================
+--- enemylines3-1.2.orig/main.cc	2007-05-14 23:00:24.000000000 +0200
++++ enemylines3-1.2/main.cc	2007-05-14 23:00:24.000000000 +0200
+@@ -63,24 +63,10 @@
+ }
+ void load_font(std::string dir) {
+ 	std::string path;
+-	if (dir=="") {
+-		path="data/";
+-		std::cout << "  Looking in " << path << std::endl;
+-		if (Font::load(path)) return;
+-		
+-		path="/usr/local/share/";
+-		path+=PATHNAME;
+-		path+="/";
+-		std::cout << "  Looking in " << path << std::endl;
+-		if (Font::load(path)) return;
+-
+-		path="/usr/share/";
+-		path+=PATHNAME;
+-		path+="/";
+-		std::cout << "  Looking in " << path << std::endl;
+-		if (Font::load(path)) return;
+ 
+-	}
++  path="/usr/share/fonts/truetype/ttf-dejavu/";
++  std::cout << "  Looking in " << path << std::endl;
++  if (Font::load(path)) return;
+ 
+ 	if (Font::load(dir)) return;
+ 	std::cerr << "  Font file not found ... Using fallback." << std::endl;
+Index: enemylines3-1.2/font.cc
+===================================================================
+--- enemylines3-1.2.orig/font.cc	2007-05-14 23:00:23.000000000 +0200
++++ enemylines3-1.2/font.cc	2007-05-14 23:01:18.000000000 +0200
+@@ -25,20 +25,20 @@
+ 		return true;
+ 	#endif
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",11);
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11);
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(0,dl,6,11);
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",22);
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22);
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(1,dl,14,22);
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",22,C3(250,0,0));
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",22,C3(250,0,0));
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(2,dl,14,22);
+ 
+ 
+-	dl=Font_ttf::gen_dl(path+"font.ttf",11,C3(255,255,0));
++	dl=Font_ttf::gen_dl(path+"DejaVuSansMono.ttf",11,C3(255,255,0));
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(3,dl,6,11);
+