r2680 - in packages/trunk/enemylines3/debian: . patches

Gonéri Le Bouder goneri-guest at alioth.debian.org
Mon May 14 21:06:32 UTC 2007 

Author: goneri-guest
Date: 2007-05-14 21:06:31 +0000 (Mon, 14 May 2007)
New Revision: 2680

Added:
   packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff
Modified:
   packages/trunk/enemylines3/debian/changelog
   packages/trunk/enemylines3/debian/control
   packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch
   packages/trunk/enemylines3/debian/rules
Log:
  * update the Homepage location
  * use the ttf-bitstream-vera/VeraMono.ttf instead of the duplicated one
  * fix the build with gcc-snapshot


Modified: packages/trunk/enemylines3/debian/changelog
===================================================================
--- packages/trunk/enemylines3/debian/changelog	2007-05-14 17:58:49 UTC (rev 2679)
+++ packages/trunk/enemylines3/debian/changelog	2007-05-14 21:06:31 UTC (rev 2680)
@@ -4,9 +4,10 @@
   * remove Applications from Categorie in the desktop file since it's not
     an official categorie
   * use of quilt instead of dpatch
->>> TODO not fixed yet!
   * FTBFS with GCC 4.3, thanks Martin Michlmayr (Closes: #417169)
    - add fix_gcc4.3.patch
+  * update the Homepage location
+  * use the ttf-bitstream-vera/VeraMono.ttf instead of the duplicated one
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Mon, 14 May 2007 01:16:06 +0200
 

Modified: packages/trunk/enemylines3/debian/control
===================================================================
--- packages/trunk/enemylines3/debian/control	2007-05-14 17:58:49 UTC (rev 2679)
+++ packages/trunk/enemylines3/debian/control	2007-05-14 21:06:31 UTC (rev 2680)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libcurl3-dev, dpatch, docbook-to-man
+Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libcurl3-dev, docbook-to-man, quilt
 Standards-Version: 3.7.2
 
 Package: enemylines3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-bitstream-vera
 Description: semi-abstract first person 3d-shooter game
  single-player game. You have to shoot evil robots before they get too 
  close, you can use your jetpack to  escape.
  The robos can't jump but they tear down walls.
  .
-  Homepage: http://raum1.memebot.com/enemylines/part3.html
+  Homepage: http://proj.phk.at/el/3/ 

Modified: packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch
===================================================================
--- packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch	2007-05-14 17:58:49 UTC (rev 2679)
+++ packages/trunk/enemylines3/debian/patches/fix_gcc4.3.patch	2007-05-14 21:06:31 UTC (rev 2680)
@@ -1,7 +1,7 @@
 Index: enemylines3-1.2/random.cc
 ===================================================================
---- enemylines3-1.2.orig/random.cc	2007-05-14 01:11:21.000000000 +0200
-+++ enemylines3-1.2/random.cc	2007-05-14 01:12:33.000000000 +0200
+--- enemylines3-1.2.orig/random.cc	2006-03-30 18:16:47.000000000 +0200
++++ enemylines3-1.2/random.cc	2007-05-14 22:36:20.000000000 +0200
 @@ -1,5 +1,6 @@
  #include "random.h"
  
@@ -9,3 +9,15 @@
  #include <iostream>
  
  
+Index: enemylines3-1.2/c3_tpl.h
+===================================================================
+--- enemylines3-1.2.orig/c3_tpl.h	2007-05-14 22:37:33.000000000 +0200
++++ enemylines3-1.2/c3_tpl.h	2007-05-14 22:38:46.000000000 +0200
+@@ -1,6 +1,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <utility>
++#include <limits>
+ #include <cmath>
+ 
+ 

Added: packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff
===================================================================
--- packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff	                        (rev 0)
+++ packages/trunk/enemylines3/debian/patches/use_bitstream-vera_from_debian.diff	2007-05-14 21:06:31 UTC (rev 2680)
@@ -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-bitstream-vera/";
++  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+"VeraMono.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+"VeraMono.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+"VeraMono.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+"VeraMono.ttf",11,C3(255,255,0));
+ 	if (dl==0) return false;
+ 	Font_ogl::init_font(3,dl,6,11);
+ 

Modified: packages/trunk/enemylines3/debian/rules
===================================================================
--- packages/trunk/enemylines3/debian/rules	2007-05-14 17:58:49 UTC (rev 2679)
+++ packages/trunk/enemylines3/debian/rules	2007-05-14 21:06:31 UTC (rev 2680)
@@ -61,6 +61,7 @@
 	mv $(CURDIR)/debian/enemylines3/usr/bin $(CURDIR)/debian/enemylines3/usr/games
 	dh_install -penemylines3 debian/enemylines3.desktop usr/share/applications
 	dh_install -penemylines3 debian/enemylines3.xpm usr/share/pixmaps
+	rm $(CURDIR)/debian/enemylines3/usr/share/enemylines3/font.ttf
 
 
 # Build architecture-independent files here.

More information about the Pkg-games-commits mailing list