Author: xnox Date: 2012-05-31 01:59:42 +0000 (Thu, 31 May 2012) New Revision: 13642
Added: packages/tags/btanks/0.9.8083-4/ packages/tags/btanks/0.9.8083-4/debian/changelog packages/tags/btanks/0.9.8083-4/debian/patches/gcc-4.7.patch Removed: packages/tags/btanks/0.9.8083-4/debian/changelog packages/tags/btanks/0.9.8083-4/debian/patches/gcc-4.7.patch Log: [svn-buildpackage] Tagging btanks 0.9.8083-4 Deleted: packages/tags/btanks/0.9.8083-4/debian/changelog =================================================================== --- packages/trunk/btanks/debian/changelog 2012-05-28 21:49:35 UTC (rev 13640) +++ packages/tags/btanks/0.9.8083-4/debian/changelog 2012-05-31 01:59:42 UTC (rev 13642) @@ -1,128 +0,0 @@ -btanks (0.9.8083-4) UNRELEASED; urgency=low - - * Team upload. - - [ Ansgar Burchardt ] - * Use XZ compression for binary packages. - - [ 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 - * Fix Vcs-Browser field - * debian/patches/remove_default_optimizations.patch: Add DEP-3 header - - -- Vincent Legout <[email protected]> Fri, 18 May 2012 09:18:53 +0200 - -btanks (0.9.8083-3) unstable; urgency=low - - * Fix FTBFS with gcc-4.6. (Closes: #624916) - + new patch: gcc-4.6.patch - * Use dpkg-buildflags and hardening-includes to set compiler flags. - * debian/control: Use Breaks instead of Conflicts. - * Bump Standards-Version to 3.9.2. - * debian/control: Remove DM-Upload-Allowed. - * Update my email address. - - -- Ansgar Burchardt <[email protected]> Tue, 10 May 2011 08:21:56 +0200 - -btanks (0.9.8083-2) unstable; urgency=low - - * Fix build failure when building only arch-specific package. - * debian/control: Add DM-Upload-Allowed: yes. - - -- Ansgar Burchardt <[email protected]> Sun, 17 Jan 2010 00:02:57 +0900 - -btanks (0.9.8083-1) unstable; urgency=low - - [ Ansgar Burchardt ] - * New upstream release. - + Update debian/copyright. - * Switch to source format v3 and drop b-dep on quilt. - * debian/rules: Use override_* rules. - * Bump Standards Version to 3.8.3 (no changes). - - [ Gonéri Le Bouder ] - * Use source format v3 to store html.tar.uu content directly in - debian/ directory - * doc is in btanks package, Move btanks-data.doc-base to btanks.doc-base - - add a conflicts against btanks-data << 0.9.8083-1 - * Add myself in Uploaders: - - -- Gonéri Le Bouder <[email protected]> Sun, 10 Jan 2010 02:25:17 +0100 - -btanks (0.8.7686-2) unstable; urgency=low - - * Do not use the CURRENCY_SYMBOL identifier in mrt/tclUniData.c. - This should fix the build failure on alpha. - + new patch rename-currency-symbol.patch - - -- Ansgar Burchardt <[email protected]> Tue, 17 Feb 2009 00:16:17 +0100 - -btanks (0.8.7686-1) unstable; urgency=low - - * New Upstream Version (Closes: #490792, #496997) - + Get available resolutions from the SDL (Closes: #440737) - + New sound backend (Closes: #440897) - * Refresh remove_default_optimizations.patch - * Remove btanks_gcc43.patch (applied upstream) - * Rewrote debian/rules to use debhelper 7 - * Change description for btanks-data - * Add myself to Uploaders - * Convert debian/copyright to proposed machine-readable format - and update for new upstream release - * Bump Standards Version to 3.8.0 (no changes) - - -- Ansgar Burchardt <[email protected]> Sun, 21 Sep 2008 19:11:19 +0200 - -btanks (0.7.5800-2) unstable; urgency=high - - [ Barry deFreese ] - * btanks_gcc43.patch - Build with gcc-4.3. (Closes: #470980). - - [ Alexander Schmehl ] - * Adjusting build-depends for dh_icon - * Set correct doc-base section - - -- Alexander Schmehl <[email protected]> Mon, 07 Apr 2008 23:38:08 +0200 - -btanks (0.7.5800-1) unstable; urgency=low - - [ Barry deFreese ] - * New upstream release (Closes: #449455) - * debian/docs - remove about_us.txt File no longer exists - * Add watch file - * Remove XS- prefix from VCS fields in control - * Remove Homepage from package descriptions - * Add myself to uploaders - * Bump Standards Version to 3.7.3 - * Add build-dep on liblua5.1 for new release - * Change menu section to Games/Action - * Add -l$(CURDIR)/debian/btanks/usr/lib/btanks to dh_shlibdeps - - [ Simon Ruggier ] - * rules: add call to dh_desktop in the binary-arch target - * menu: change section to Games/Arcade, which exists in the menu spec - * btanks.desktop: add ArcadeGame to Categories - + remove deprecated Encoding key - - [ Paul Wise ] - * Call dh_icons to update icon caches - * Improve the description for the data package - * Clean up the watch file - * Drop ${shlibs:Depends} from data pkg deps - - -- Barry deFreese <[email protected]> Sun, 07 Oct 2007 22:32:28 -0400 - -btanks (0.5.4740-2) unstable; urgency=low - - * Corrected btanks-data.doc-base. Wrong mention to other package. - - -- Miriam Ruiz <[email protected]> Fri, 24 Aug 2007 09:47:46 +0200 - -btanks (0.5.4740-1) unstable; urgency=low - - * Initial release (Closes: #434740) - - -- Miriam Ruiz <[email protected]> Sat, 04 Aug 2007 17:16:13 +0000 - Copied: packages/tags/btanks/0.9.8083-4/debian/changelog (from rev 13641, packages/trunk/btanks/debian/changelog) =================================================================== --- packages/tags/btanks/0.9.8083-4/debian/changelog (rev 0) +++ packages/tags/btanks/0.9.8083-4/debian/changelog 2012-05-31 01:59:42 UTC (rev 13642) @@ -0,0 +1,133 @@ +btanks (0.9.8083-4) unstable; urgency=low + + * Team upload. + + [ Ansgar Burchardt ] + * Use XZ compression for binary packages. + + [ Vincent Legout ] + * Build-Depends on zlib1g-dev, fix FTBFS (Closes: #669518) + * Fix Vcs-Browser field + * debian/patches/remove_default_optimizations.patch: Add DEP-3 header + + -- Dmitrijs Ledkovs <[email protected]> Thu, 31 May 2012 02:47:36 +0100 + +btanks (0.9.8083-3.1) unstable; urgency=low + + * Non maintainer upload. + * Fix build failure with GCC 4.7. Closes: #667123. + + -- Matthias Klose <[email protected]> Wed, 30 May 2012 04:35:06 +0000 + +btanks (0.9.8083-3) unstable; urgency=low + + * Fix FTBFS with gcc-4.6. (Closes: #624916) + + new patch: gcc-4.6.patch + * Use dpkg-buildflags and hardening-includes to set compiler flags. + * debian/control: Use Breaks instead of Conflicts. + * Bump Standards-Version to 3.9.2. + * debian/control: Remove DM-Upload-Allowed. + * Update my email address. + + -- Ansgar Burchardt <[email protected]> Tue, 10 May 2011 08:21:56 +0200 + +btanks (0.9.8083-2) unstable; urgency=low + + * Fix build failure when building only arch-specific package. + * debian/control: Add DM-Upload-Allowed: yes. + + -- Ansgar Burchardt <[email protected]> Sun, 17 Jan 2010 00:02:57 +0900 + +btanks (0.9.8083-1) unstable; urgency=low + + [ Ansgar Burchardt ] + * New upstream release. + + Update debian/copyright. + * Switch to source format v3 and drop b-dep on quilt. + * debian/rules: Use override_* rules. + * Bump Standards Version to 3.8.3 (no changes). + + [ Gonéri Le Bouder ] + * Use source format v3 to store html.tar.uu content directly in + debian/ directory + * doc is in btanks package, Move btanks-data.doc-base to btanks.doc-base + - add a conflicts against btanks-data << 0.9.8083-1 + * Add myself in Uploaders: + + -- Gonéri Le Bouder <[email protected]> Sun, 10 Jan 2010 02:25:17 +0100 + +btanks (0.8.7686-2) unstable; urgency=low + + * Do not use the CURRENCY_SYMBOL identifier in mrt/tclUniData.c. + This should fix the build failure on alpha. + + new patch rename-currency-symbol.patch + + -- Ansgar Burchardt <[email protected]> Tue, 17 Feb 2009 00:16:17 +0100 + +btanks (0.8.7686-1) unstable; urgency=low + + * New Upstream Version (Closes: #490792, #496997) + + Get available resolutions from the SDL (Closes: #440737) + + New sound backend (Closes: #440897) + * Refresh remove_default_optimizations.patch + * Remove btanks_gcc43.patch (applied upstream) + * Rewrote debian/rules to use debhelper 7 + * Change description for btanks-data + * Add myself to Uploaders + * Convert debian/copyright to proposed machine-readable format + and update for new upstream release + * Bump Standards Version to 3.8.0 (no changes) + + -- Ansgar Burchardt <[email protected]> Sun, 21 Sep 2008 19:11:19 +0200 + +btanks (0.7.5800-2) unstable; urgency=high + + [ Barry deFreese ] + * btanks_gcc43.patch - Build with gcc-4.3. (Closes: #470980). + + [ Alexander Schmehl ] + * Adjusting build-depends for dh_icon + * Set correct doc-base section + + -- Alexander Schmehl <[email protected]> Mon, 07 Apr 2008 23:38:08 +0200 + +btanks (0.7.5800-1) unstable; urgency=low + + [ Barry deFreese ] + * New upstream release (Closes: #449455) + * debian/docs - remove about_us.txt File no longer exists + * Add watch file + * Remove XS- prefix from VCS fields in control + * Remove Homepage from package descriptions + * Add myself to uploaders + * Bump Standards Version to 3.7.3 + * Add build-dep on liblua5.1 for new release + * Change menu section to Games/Action + * Add -l$(CURDIR)/debian/btanks/usr/lib/btanks to dh_shlibdeps + + [ Simon Ruggier ] + * rules: add call to dh_desktop in the binary-arch target + * menu: change section to Games/Arcade, which exists in the menu spec + * btanks.desktop: add ArcadeGame to Categories + + remove deprecated Encoding key + + [ Paul Wise ] + * Call dh_icons to update icon caches + * Improve the description for the data package + * Clean up the watch file + * Drop ${shlibs:Depends} from data pkg deps + + -- Barry deFreese <[email protected]> Sun, 07 Oct 2007 22:32:28 -0400 + +btanks (0.5.4740-2) unstable; urgency=low + + * Corrected btanks-data.doc-base. Wrong mention to other package. + + -- Miriam Ruiz <[email protected]> Fri, 24 Aug 2007 09:47:46 +0200 + +btanks (0.5.4740-1) unstable; urgency=low + + * Initial release (Closes: #434740) + + -- Miriam Ruiz <[email protected]> Sat, 04 Aug 2007 17:16:13 +0000 + Deleted: packages/tags/btanks/0.9.8083-4/debian/patches/gcc-4.7.patch =================================================================== --- packages/trunk/btanks/debian/patches/gcc-4.7.patch 2012-05-28 21:49:35 UTC (rev 13640) +++ packages/tags/btanks/0.9.8083-4/debian/patches/gcc-4.7.patch 2012-05-31 01:59:42 UTC (rev 13642) @@ -1,59 +0,0 @@ -From: Vincent Legout <[email protected]> -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 { Copied: packages/tags/btanks/0.9.8083-4/debian/patches/gcc-4.7.patch (from rev 13641, packages/trunk/btanks/debian/patches/gcc-4.7.patch) =================================================================== --- packages/tags/btanks/0.9.8083-4/debian/patches/gcc-4.7.patch (rev 0) +++ packages/tags/btanks/0.9.8083-4/debian/patches/gcc-4.7.patch 2012-05-31 01:59:42 UTC (rev 13642) @@ -0,0 +1,231 @@ +From: Vincent Legout <[email protected]>, Matthias Klose <[email protected]> +Bug-Debian: http://bugs.debian.org/667123 +Subject: Fix FTBFS with gcc-4.7 + +Index: btanks-0.9.8083/engine/sl08/sl08.h +=================================================================== +--- btanks-0.9.8083.orig/engine/sl08/sl08.h 2012-05-30 06:48:55.924037180 +0200 ++++ btanks-0.9.8083/engine/sl08/sl08.h 2012-05-30 06:58:12.832049763 +0200 +@@ -92,11 +92,11 @@ + typedef base_signal0 <return_type> signal_type; + typedef return_type (object_type::*func_t) (); + +- inline slot0 () : object(NULL), func(NULL) {} +- inline slot0(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slot0 () : object(0), func(0) {} ++ inline slot0(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() () const { + return (object->*func) () ; +@@ -114,10 +114,10 @@ + typedef base_signal0 <void> signal_type; + typedef void (object_type::*func_t) () ; + +- inline slot0 () : object(NULL), func(NULL) {} ++ inline slot0 () : object(0), func(0) {} + inline slot0 (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() () const { + (object->*func) (); +@@ -267,11 +267,11 @@ + typedef base_signal1 <return_type, arg1_type> signal_type; + typedef return_type (object_type::*func_t) (arg1_type a1); + +- inline slot1 () : object(NULL), func(NULL) {} +- inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slot1 () : object(0), func(0) {} ++ inline slot1(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() (arg1_type a1) const { + return (object->*func) (a1) ; +@@ -289,10 +289,10 @@ + typedef base_signal1 <void, arg1_type> signal_type; + typedef void (object_type::*func_t) (arg1_type a1) ; + +- inline slot1 () : object(NULL), func(NULL) {} ++ inline slot1 () : object(0), func(0) {} + inline slot1 (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() (arg1_type a1) const { + (object->*func) (a1); +@@ -442,11 +442,11 @@ + typedef base_signal2 <return_type, arg1_type, arg2_type> signal_type; + typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2); + +- inline slot2 () : object(NULL), func(NULL) {} +- inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slot2 () : object(0), func(0) {} ++ inline slot2(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() (arg1_type a1, arg2_type a2) const { + return (object->*func) (a1, a2) ; +@@ -464,10 +464,10 @@ + typedef base_signal2 <void, arg1_type, arg2_type> signal_type; + typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2) ; + +- inline slot2 () : object(NULL), func(NULL) {} ++ inline slot2 () : object(0), func(0) {} + inline slot2 (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() (arg1_type a1, arg2_type a2) const { + (object->*func) (a1, a2); +@@ -617,11 +617,11 @@ + typedef base_signal3 <return_type, arg1_type, arg2_type, arg3_type> signal_type; + typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3); + +- inline slot3 () : object(NULL), func(NULL) {} +- inline slot3(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slot3 () : object(0), func(0) {} ++ inline slot3(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() (arg1_type a1, arg2_type a2, arg3_type a3) const { + return (object->*func) (a1, a2, a3) ; +@@ -639,10 +639,10 @@ + typedef base_signal3 <void, arg1_type, arg2_type, arg3_type> signal_type; + typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3) ; + +- inline slot3 () : object(NULL), func(NULL) {} ++ inline slot3 () : object(0), func(0) {} + inline slot3 (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() (arg1_type a1, arg2_type a2, arg3_type a3) const { + (object->*func) (a1, a2, a3); +@@ -792,11 +792,11 @@ + typedef base_signal4 <return_type, arg1_type, arg2_type, arg3_type, arg4_type> signal_type; + typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4); + +- inline slot4 () : object(NULL), func(NULL) {} +- inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slot4 () : object(0), func(0) {} ++ inline slot4(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() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { + return (object->*func) (a1, a2, a3, a4) ; +@@ -814,10 +814,10 @@ + typedef base_signal4 <void, arg1_type, arg2_type, arg3_type, arg4_type> signal_type; + typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) ; + +- inline slot4 () : object(NULL), func(NULL) {} ++ inline slot4 () : object(0), func(0) {} + inline slot4 (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() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { + (object->*func) (a1, a2, a3, a4); +@@ -967,11 +967,11 @@ + typedef base_signal5 <return_type, arg1_type, arg2_type, arg3_type, arg4_type, arg5_type> signal_type; + typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5); + +- inline slot5 () : object(NULL), func(NULL) {} +- inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slot5 () : object(0), func(0) {} ++ inline slot5(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() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { + return (object->*func) (a1, a2, a3, a4, a5) ; +@@ -989,10 +989,10 @@ + typedef base_signal5 <void, arg1_type, arg2_type, arg3_type, arg4_type, arg5_type> signal_type; + typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) ; + +- inline slot5 () : object(NULL), func(NULL) {} ++ inline slot5 () : object(0), func(0) {} + inline slot5 (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() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { + (object->*func) (a1, a2, a3, a4, a5); +Index: btanks-0.9.8083/engine/sl08/sl08.py +=================================================================== +--- btanks-0.9.8083.orig/engine/sl08/sl08.py 2012-05-30 06:48:55.916037177 +0200 ++++ btanks-0.9.8083/engine/sl08/sl08.py 2012-05-30 06:49:25.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-05-30 06:53:15.232047856 +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-05-30 06:58:45.064050493 +0200 +@@ -20,6 +20,7 @@ + */ + + #include <string> ++#include <unistd.h> + #include "export_mrt.h" + + namespace mrt { _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
