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

Ansgar Burchardt ansgar at alioth.debian.org
Mon May 9 21:37:33 UTC 2011 

Author: ansgar
Date: 2011-05-09 21:37:30 +0000 (Mon, 09 May 2011)
New Revision: 12310

Added:
   packages/trunk/btanks/debian/patches/gcc-4.6.patch
Modified:
   packages/trunk/btanks/debian/btanks-data.dirs
   packages/trunk/btanks/debian/changelog
   packages/trunk/btanks/debian/clean
   packages/trunk/btanks/debian/control
   packages/trunk/btanks/debian/copyright
   packages/trunk/btanks/debian/patches/series
   packages/trunk/btanks/debian/rules
Log:
* Fix FTBFS with gcc-4.6. (Closes: #624916)
  + new patch: gcc-4.6.patch
* debian/control: Use Breaks instead of Conflicts.
* Bump Standards-Version to 3.9.2.

Modified: packages/trunk/btanks/debian/btanks-data.dirs
===================================================================
--- packages/trunk/btanks/debian/btanks-data.dirs	2011-05-09 20:00:02 UTC (rev 12309)
+++ packages/trunk/btanks/debian/btanks-data.dirs	2011-05-09 21:37:30 UTC (rev 12310)
@@ -1,3 +1 @@
 usr/share/games/btanks/
-usr/share/doc/btanks/
-

Modified: packages/trunk/btanks/debian/changelog
===================================================================
--- packages/trunk/btanks/debian/changelog	2011-05-09 20:00:02 UTC (rev 12309)
+++ packages/trunk/btanks/debian/changelog	2011-05-09 21:37:30 UTC (rev 12310)
@@ -1,9 +1,13 @@
-btanks (0.9.8083-3) UNRELEASED; urgency=low
+btanks (0.9.8083-3) unstable; urgency=low
 
+  * Fix FTBFS with gcc-4.6. (Closes: #624916)
+    + new patch: gcc-4.6.patch
+  * 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 <ansgar at debian.org>  Tue, 12 Oct 2010 15:50:16 +0200
+ -- Ansgar Burchardt <ansgar at debian.org>  Mon, 09 May 2011 23:36:47 +0200
 
 btanks (0.9.8083-2) unstable; urgency=low
 

Modified: packages/trunk/btanks/debian/clean
===================================================================
--- packages/trunk/btanks/debian/clean	2011-05-09 20:00:02 UTC (rev 12309)
+++ packages/trunk/btanks/debian/clean	2011-05-09 21:37:30 UTC (rev 12310)
@@ -1,4 +1,4 @@
 config.log
 options.cache
 .sconsign.dblite
-
+engine/sl08/sl08.h

Modified: packages/trunk/btanks/debian/control
===================================================================
--- packages/trunk/btanks/debian/control	2011-05-09 20:00:02 UTC (rev 12309)
+++ packages/trunk/btanks/debian/control	2011-05-09 21:37:30 UTC (rev 12310)
@@ -7,8 +7,9 @@
 Build-Depends: debhelper (>= 7.0.50~), scons, sharutils,
  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
-Standards-Version: 3.8.3
+ libsmpeg-dev, libvorbis-dev, libsigc++-2.0-dev, libexpat1-dev,
+ python
+Standards-Version: 3.9.2
 Homepage: http://btanks.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/btanks/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/btanks/?op=log

Modified: packages/trunk/btanks/debian/copyright
===================================================================
--- packages/trunk/btanks/debian/copyright	2011-05-09 20:00:02 UTC (rev 12309)
+++ packages/trunk/btanks/debian/copyright	2011-05-09 21:37:30 UTC (rev 12310)
@@ -44,8 +44,8 @@
  .
   5. Only Netive Company, Ltd. may make changes or additions to the Exception.
  .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.
 
 Files: clunk/*
 Copyright: © 2007-2008, Netive Media Group
@@ -64,8 +64,8 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
+ On Debian systems, the complete text of version 2.1 of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: clunk/kemar.c, clunk/kemar.h
 Copyright: © 1994, MIT Media Laboratory
@@ -135,8 +135,8 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
+ On Debian systems, the complete text of version 2.1 of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: sdlx/SDL_win32_main.c
 Copyright: placed in the public domain by Sam Lantinga  4/13/98
@@ -168,8 +168,8 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
+ On Debian systems, the complete text of version 2.1 of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: debian/*
 Copyright:
@@ -186,4 +186,3 @@
 License: GPL-2+
  Permission has been granted by the authors of the documentation to release
  it under the GPL license.
-

Added: packages/trunk/btanks/debian/patches/gcc-4.6.patch
===================================================================
--- packages/trunk/btanks/debian/patches/gcc-4.6.patch	                        (rev 0)
+++ packages/trunk/btanks/debian/patches/gcc-4.6.patch	2011-05-09 21:37:30 UTC (rev 12310)
@@ -0,0 +1,26 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Bug-Debian: http://bugs.debian.org/624916
+Subject: Fix FTBFS with gcc-4.6
+
+--- btanks-0.9.8083.orig/engine/sl08/sl08.py
++++ btanks-0.9.8083/engine/sl08/sl08.py
+@@ -152,8 +152,8 @@ class Generator(object):
+ 			typedef base_signalXXX %s signal_type; 
+ 			typedef return_type (object_type::*func_t) %s; 
+ 
+-			inline slotXXX () : object(NULL), func(NULL) {}
+-			inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++			inline slotXXX () : object(0), func(0) {}
++			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); }
+@@ -187,7 +187,7 @@ class Generator(object):
+ 			typedef base_signalXXX %s signal_type; 
+ 			typedef void (object_type::*func_t) %s ;
+ 
+-			inline slotXXX () : object(NULL), func(NULL) {}
++			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); }

Modified: packages/trunk/btanks/debian/patches/series
===================================================================
--- packages/trunk/btanks/debian/patches/series	2011-05-09 20:00:02 UTC (rev 12309)
+++ packages/trunk/btanks/debian/patches/series	2011-05-09 21:37:30 UTC (rev 12310)
@@ -1,2 +1,3 @@
 remove_default_optimizations.patch
 rename-currency-symbol.patch
+gcc-4.6.patch

Modified: packages/trunk/btanks/debian/rules
===================================================================
--- packages/trunk/btanks/debian/rules	2011-05-09 20:00:02 UTC (rev 12309)
+++ packages/trunk/btanks/debian/rules	2011-05-09 21:37:30 UTC (rev 12310)
@@ -7,6 +7,9 @@
 
 override_dh_auto_configure:
 	sed -e 's/:CFLAGS:/$(CFLAGS)/' < debian/options.cache > options.cache
+
+override_dh_auto_build:
+	python engine/sl08/sl08.py >engine/sl08/sl08.h
 	scons prefix=/usr resources_dir=/usr/share/games/btanks plugins_dir=/usr/lib/btanks lib_dir=/usr/lib/btanks
 
 override_dh_auto_clean:

More information about the Pkg-games-commits mailing list