r13514 - in packages/trunk/btanks/debian: . patches

[Vincent Legout]

Author: vlegout
Date: 2012-04-29 14:47:33 +0000 (Sun, 29 Apr 2012)
New Revision: 13514

Added:
   packages/trunk/btanks/debian/patches/gcc-4.7.patch
Modified:
   packages/trunk/btanks/debian/changelog
   packages/trunk/btanks/debian/control
   packages/trunk/btanks/debian/patches/series
Log:
Build-Depends on zlib1g-dev, fix gcc-4.7 FTBFS

Modified: packages/trunk/btanks/debian/changelog
===================================================================
--- packages/trunk/btanks/debian/changelog	2012-04-29 10:26:47 UTC (rev 13513)
+++ packages/trunk/btanks/debian/changelog	2012-04-29 14:47:33 UTC (rev 13514)
@@ -1,9 +1,17 @@
 btanks (0.9.8083-4) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Ansgar Burchardt ]
   * Use XZ compression for binary packages.
 
- -- Ansgar Burchardt <ansgar at debian.org>  Thu, 11 Aug 2011 15:40:32 +0200
+  [ Vincent Legout ]
+  * Build-Depends on zlib1g-dev, fix FTBFS (Closes: #669518)
+  * Fix FTBFS with gcc-4.7 (Closes: #667123)
+    - New patch gcc-4.7.patch
 
+ -- Vincent Legout <vlegout at debian.org>  Sun, 29 Apr 2012 16:23:05 +0200
+
 btanks (0.9.8083-3) unstable; urgency=low
 
   * Fix FTBFS with gcc-4.6. (Closes: #624916)

Modified: packages/trunk/btanks/debian/control
===================================================================
--- packages/trunk/btanks/debian/control	2012-04-29 10:26:47 UTC (rev 13513)
+++ packages/trunk/btanks/debian/control	2012-04-29 14:47:33 UTC (rev 13514)
@@ -8,7 +8,7 @@
  libsdl1.2-dev, libsdl-image1.2-dev, liblua5.1-dev,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsmpeg-dev, libvorbis-dev, libsigc++-2.0-dev, libexpat1-dev,
- dpkg (>= 1.15.7), hardening-includes, python
+ dpkg (>= 1.15.7), hardening-includes, python, zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://btanks.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/btanks/

Added: packages/trunk/btanks/debian/patches/gcc-4.7.patch
===================================================================
--- packages/trunk/btanks/debian/patches/gcc-4.7.patch	                        (rev 0)
+++ packages/trunk/btanks/debian/patches/gcc-4.7.patch	2012-04-29 14:47:33 UTC (rev 13514)
@@ -0,0 +1,59 @@
+From: Vincent Legout <vlegout at debian.org>
+Bug-Debian: http://bugs.debian.org/667123
+Subject: Fix FTBFS with gcc-4.7
+
+Index: btanks-0.9.8083/engine/sl08/sl08.py
+===================================================================
+--- btanks-0.9.8083.orig/engine/sl08/sl08.py	2012-04-29 15:43:28.000000000 +0200
++++ btanks-0.9.8083/engine/sl08/sl08.py	2012-04-29 15:43:28.000000000 +0200
+@@ -156,7 +156,7 @@
+ 			inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() %s const { 
+ 				return (object->*func) %s ;
+@@ -190,7 +190,7 @@
+ 			inline slotXXX () : object(0), func(0) {}
+ 			inline slotXXX (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() %s const { 
+ 				(object->*func) %s; 
+Index: btanks-0.9.8083/math/range_list.h
+===================================================================
+--- btanks-0.9.8083.orig/math/range_list.h	2008-10-24 16:15:55.000000000 +0200
++++ btanks-0.9.8083/math/range_list.h	2012-04-29 15:47:10.577334006 +0200
+@@ -53,14 +53,14 @@
+ 			return;
+ 		}
+ 	
+-		typename parent_type::iterator i = lower_bound(value);
++		typename parent_type::iterator i = this->lower_bound(value);
+ 		if (i != parent_type::end()) {
+ 			if (i->first == value)
+ 				return;
+ 
+ 			if (value + 1 == i->first) {
+ 				T e = i->second;
+-				erase(i);
++				this->erase(i);
+ 				i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ 				i = pack_left(i);
+ 			}
+Index: btanks-0.9.8083/mrt/base_file.h
+===================================================================
+--- btanks-0.9.8083.orig/mrt/base_file.h	2009-04-04 22:28:59.000000000 +0200
++++ btanks-0.9.8083/mrt/base_file.h	2012-04-29 15:51:45.377341574 +0200
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <string>
++#include <unistd.h>
+ #include "export_mrt.h"
+ 
+ namespace mrt {

Modified: packages/trunk/btanks/debian/patches/series
===================================================================
--- packages/trunk/btanks/debian/patches/series	2012-04-29 10:26:47 UTC (rev 13513)
+++ packages/trunk/btanks/debian/patches/series	2012-04-29 14:47:33 UTC (rev 13514)
@@ -1,3 +1,4 @@
 remove_default_optimizations.patch
 rename-currency-symbol.patch
 gcc-4.6.patch
+gcc-4.7.patch