r440 - in packages/enemylines/enemylines7/trunk/debian: . patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-04-07 23:44:26 +0000 (Fri, 07 Apr 2006)
New Revision: 440

Added:
   packages/enemylines/enemylines7/trunk/debian/patches/03_compile_with_g++4.1.patch
Modified:
   packages/enemylines/enemylines7/trunk/debian/changelog
   packages/enemylines/enemylines7/trunk/debian/patches/00list
Log:
fix FTBFS with g++ v4.1 (thanks Martin Michlmayr)

Modified: packages/enemylines/enemylines7/trunk/debian/changelog
===================================================================
--- packages/enemylines/enemylines7/trunk/debian/changelog	2006-04-06 14:05:36 UTC (rev 439)
+++ packages/enemylines/enemylines7/trunk/debian/changelog	2006-04-07 23:44:26 UTC (rev 440)
@@ -1,9 +1,14 @@
 enemylines7 (0.5-3) UNRELEASED; urgency=low
 
+  [ Gonéri Le Bouder ]
   * dh_install uncommented to install menu file
   * install a .desktop file
   * homemade pixmaps added
 
+  [ Eddy Petrișor ]
+  * add patch to fix FTBFS with g++ v4.1
+    (thanks Martin Michlmayr) (closes: #361333)
+
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Thu, 30 Mar 2006 00:34:05 +0200
 
 enemylines7 (0.5-2) unstable; urgency=low

Modified: packages/enemylines/enemylines7/trunk/debian/patches/00list
===================================================================
--- packages/enemylines/enemylines7/trunk/debian/patches/00list	2006-04-06 14:05:36 UTC (rev 439)
+++ packages/enemylines/enemylines7/trunk/debian/patches/00list	2006-04-07 23:44:26 UTC (rev 440)
@@ -1,2 +1,3 @@
-01_add_destdir_in_makefile.patch
-02_data_in_usr_share.patch
+debian/patches/01_add_destdir_in_makefile.patch
+debian/patches/02_data_in_usr_share.patch
+debian/patches/03_compile_with_g++4.1.patch

Added: packages/enemylines/enemylines7/trunk/debian/patches/03_compile_with_g++4.1.patch
===================================================================
--- packages/enemylines/enemylines7/trunk/debian/patches/03_compile_with_g++4.1.patch	2006-04-06 14:05:36 UTC (rev 439)
+++ packages/enemylines/enemylines7/trunk/debian/patches/03_compile_with_g++4.1.patch	2006-04-07 23:44:26 UTC (rev 440)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_compile_with_gcc4.dpatch by Eddy Petrişor <eddy.petrisor at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch allows enemylines7 to compile with g++ v4.1
+
+ at DPATCH@
+
+
+diff -ru diff -ru enemylines.orig/map.h enemylines7-0.5/map.h
+--- enemylines.orig/map.h    2006-04-07 22:00:47.000000000 +0000
++++ enemylines7-0.5/map.h     2006-04-07 22:00:55.000000000 +0000
+@@ -25,8 +25,8 @@
+       unsigned int dz();
+
+
+-       bool Map::inside(C3 c);
+-       bool Map::inside(C3f c);
++       bool inside(C3 c);
++       bool inside(C3f c);
+
+       e_tiletype get(C3);
+       void set(C3,e_tiletype);
+


Property changes on: packages/enemylines/enemylines7/trunk/debian/patches/03_compile_with_g++4.1.patch
___________________________________________________________________
Name: svn:executable
   + *