diff -Nru btanks-0.9.8083/debian/btanks-data.dirs btanks-0.9.8083/debian/btanks-data.dirs --- btanks-0.9.8083/debian/btanks-data.dirs 2010-01-02 06:17:31.000000000 +0000 +++ btanks-0.9.8083/debian/btanks-data.dirs 2011-05-09 21:32:18.000000000 +0000 @@ -1,3 +1 @@ usr/share/games/btanks/ -usr/share/doc/btanks/ - diff -Nru btanks-0.9.8083/debian/changelog btanks-0.9.8083/debian/changelog --- btanks-0.9.8083/debian/changelog 2010-01-16 15:02:58.000000000 +0000 +++ btanks-0.9.8083/debian/changelog 2011-05-10 06:21:57.000000000 +0000 @@ -1,3 +1,15 @@ +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 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. diff -Nru btanks-0.9.8083/debian/clean btanks-0.9.8083/debian/clean --- btanks-0.9.8083/debian/clean 2010-01-16 13:53:52.000000000 +0000 +++ btanks-0.9.8083/debian/clean 2011-05-09 21:32:18.000000000 +0000 @@ -1,4 +1,4 @@ config.log options.cache .sconsign.dblite - +engine/sl08/sl08.h diff -Nru btanks-0.9.8083/debian/control btanks-0.9.8083/debian/control --- btanks-0.9.8083/debian/control 2010-01-16 15:02:09.000000000 +0000 +++ btanks-0.9.8083/debian/control 2011-05-10 06:20:33.000000000 +0000 @@ -3,21 +3,21 @@ Priority: extra Maintainer: Debian Games Team Uploaders: Miriam Ruiz , Barry deFreese , - Ansgar Burchardt , Gonéri Le Bouder + Ansgar Burchardt 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, + dpkg (>= 1.15.7), hardening-includes, 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 -DM-Upload-Allowed: yes Package: btanks Architecture: any Depends: btanks-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: btanks-data (<< 0.9.8083-1) +Breaks: btanks-data (<< 0.9.8083-1) Description: fast 2D tank arcade game with multiplayer and split-screen modes Battle Tanks is a funny battle on your desk, where you can choose one of three vehicles and eliminate your enemy using the whole arsenal of diff -Nru btanks-0.9.8083/debian/copyright btanks-0.9.8083/debian/copyright --- btanks-0.9.8083/debian/copyright 2010-01-02 07:11:47.000000000 +0000 +++ btanks-0.9.8083/debian/copyright 2011-05-09 21:32:18.000000000 +0000 @@ -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: @@ -178,7 +178,7 @@ © 2007, Barry deFreese © 2007, Simon Ruggier © 2008, Alexander Schmehl - © 2008, Ansgar Burchardt + © 2008, Ansgar Burchardt License: GPL-2+ Files: debian/html.tar.uu @@ -186,4 +186,3 @@ License: GPL-2+ Permission has been granted by the authors of the documentation to release it under the GPL license. - diff -Nru btanks-0.9.8083/debian/options.cache btanks-0.9.8083/debian/options.cache --- btanks-0.9.8083/debian/options.cache 2010-01-02 06:17:31.000000000 +0000 +++ btanks-0.9.8083/debian/options.cache 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -CC = 'gcc' -CXX = 'g++' -CCFLAGS = ' :CFLAGS: ' -CXXFLAGS = ' :CFLAGS: ' diff -Nru btanks-0.9.8083/debian/patches/gcc-4.6.patch btanks-0.9.8083/debian/patches/gcc-4.6.patch --- btanks-0.9.8083/debian/patches/gcc-4.6.patch 1970-01-01 00:00:00.000000000 +0000 +++ btanks-0.9.8083/debian/patches/gcc-4.6.patch 2011-05-09 21:32:18.000000000 +0000 @@ -0,0 +1,26 @@ +From: Ansgar Burchardt +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); } diff -Nru btanks-0.9.8083/debian/patches/rename-currency-symbol.patch btanks-0.9.8083/debian/patches/rename-currency-symbol.patch --- btanks-0.9.8083/debian/patches/rename-currency-symbol.patch 2010-01-02 07:13:01.000000000 +0000 +++ btanks-0.9.8083/debian/patches/rename-currency-symbol.patch 2010-10-12 13:50:10.000000000 +0000 @@ -1,5 +1,5 @@ Subject: Don't use the CURRENCY_SYMBOL identifier -From: Ansgar Burchardt +From: Ansgar Burchardt Date: Mon, 16 Feb 2009 23:55:40 +0100 Do not use CURRENCY_SYMBOL because it is already defined in diff -Nru btanks-0.9.8083/debian/patches/series btanks-0.9.8083/debian/patches/series --- btanks-0.9.8083/debian/patches/series 2010-01-02 06:17:31.000000000 +0000 +++ btanks-0.9.8083/debian/patches/series 2011-05-09 21:32:18.000000000 +0000 @@ -1,2 +1,3 @@ remove_default_optimizations.patch rename-currency-symbol.patch +gcc-4.6.patch diff -Nru btanks-0.9.8083/debian/rules btanks-0.9.8083/debian/rules --- btanks-0.9.8083/debian/rules 2010-01-16 13:53:58.000000000 +0000 +++ btanks-0.9.8083/debian/rules 2011-05-10 06:13:17.000000000 +0000 @@ -1,12 +1,21 @@ #!/usr/bin/make -f -CFLAGS ?= -Wall -g +export CFLAGS = $(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) + +include /usr/share/hardening-includes/hardening.make +# does not work with shared libraries. +DEB_BUILD_HARDENING_PIE := 0 +CFLAGS += $(HARDENING_CFLAGS) +CXXFLAGS += $(HARDENING_CFLAGS) +LDFLAGS += $(HARDENING_LDFLAGS) %: dh $@ -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: