--- balder2d-1.0.orig/SConstruct +++ balder2d-1.0/SConstruct @@ -1,5 +1,7 @@ # SConstruct for building balder2d with scons -includepath = ['/usr/include/python2.4','include'] +import sys + +includepath = ['/usr/include/python%d.%d' % sys.version_info[:2], 'include'] env = Environment(CPPPATH=includepath) #avoid leaving .sconsign files all over the place, put all signatures in: env.SConsignFile("scons-signatures") @@ -10,7 +12,7 @@ import glob files = glob.glob("src/*.cpp") + glob.glob("src/*/*.cpp") + glob.glob("src/menu/*/*.cpp")+ glob.glob("src/*/*.c") -libs = Split('guichan_sdl guichan SDL_image SDL_mixer SDL_gfx python2.4 physfs') +libs = Split('guichan_sdl guichan SDL SDL_image SDL_mixer SDL_gfx physfs tinyxml') + ['python%d.%d' % sys.version_info[:2]] env.ParseConfig('sdl-config --cflags --libs') env.Program('bin/balder2d',files, LIBS=libs) --- balder2d-1.0.orig/bin/scripts/test/SConscript +++ balder2d-1.0/bin/scripts/test/SConscript @@ -1,4 +1,5 @@ +import sys -env = Environment(CPPPATH='/usr/include/python2.4') +env = Environment(CPPPATH='/usr/include/python%d.%d' % sys.version_info[:2]) -env.Program('runtests', 'runtests.cpp', LIBS='python2.4') +env.Program('runtests', 'runtests.cpp', LIBS='python%d.%d' % sys.version_info[:2]) --- balder2d-1.0.orig/debian/balder2d-data.install +++ balder2d-1.0/debian/balder2d-data.install @@ -0,0 +1 @@ +debian/tmp/usr/share/games/balder2d/ usr/share/games/ --- balder2d-1.0.orig/debian/balder2d.6 +++ balder2d-1.0/debian/balder2d.6 @@ -0,0 +1,51 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH BALDER2D 6 "October 14, 2006" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +balder2d \- 2D zero gravity shooter +.SH SYNOPSIS +.B balder2d +.RI [ config-file] +.br +.SH DESCRIPTION +\fBbalder2d\fP is an arcade style 2d overhead shooter, +in a zero gravity environment. +In Balder2D, players control small probes which shoot tiny projectiles with +which they try to destroy each other. It features a 2D overhead view of the +playing field. Probes may be human or computer controlled. + +A probe can perform the following actions: + + * rotate + * fire projectiles + * "stick" to a wall + * push off of a wall + +Players may rotate their probes while in flight, but the only way to change +the direction or speed of flight is by firing projectiles (which gives a +small kick in the opposite direction) or by running into walls or other probes. + +.SH OPTIONS +.TP +.B config-file +The config file to use +.SH FILES +by default the config file is ~/.balder2d.conf +.SH BUGS +There most likely are some, please report them. +.SH AUTHOR +balder2d was written by Bjorn Hansen. --- balder2d-1.0.orig/debian/balder2d.install +++ balder2d-1.0/debian/balder2d.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/balder2d/balder2d usr/lib/balder2d/ +debian/tmp/usr/games/balder2d usr/games/ +debian/tmp/usr/share/applications/Balder2D.desktop usr/share/applications/ +debian/tmp/usr/share/pixmaps/balder2d.xpm usr/share/pixmaps/ --- balder2d-1.0.orig/debian/changelog +++ balder2d-1.0/debian/changelog @@ -0,0 +1,68 @@ +balder2d (1.0-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Remove python-support, not actually used (Closes: #785947) + * Use Debian's tinyxml rather than the bundled one. + + -- Stefano Rivera Fri, 21 Aug 2015 17:30:23 +0200 + +balder2d (1.0-1.1) unstable; urgency=low + + * Non-maintainer upload, to drop Python 2.4; thanks to Luca Falavigna for the + report and to Jakub Wilk; Closes: #562406, #518172 + - debian/control + + b-d on 'python-dev (>= 2.4)' and not in the hardcoded 'python2.4-dev' + + added python-support to b-d + - SConstruct, bin/scripts/test/SConscript + + dinamically include default python, instead of hardcode python2.4 + * SConstruct + - added SDL to the list of library: it fixes a FTBFS when using gold as + linker; thanks to Peter Fritzsche for the report; Closes: #553931 + + -- Sandro Tosi Tue, 12 Jan 2010 21:42:11 +0100 + +balder2d (1.0-1) unstable; urgency=low + + * new upstream release + * update for guichan 8.1 (Closes: #482584) + * use physicsfs to make data/config/map/aiscript loading more flexible + * new skins for menus + * fix typo in control file long description (Closes: #458401) + + -- Bjørn Hansen Sun, 15 Jun 2008 17:15:38 -0700 + +balder2d (1.0~rc1-5) unstable; urgency=low + + * fixed 'Can not change keyboard controls using gui' (Closes: #446702) + + -- Bjørn Hansen Thu, 18 Oct 2007 02:41:32 +0000 + +balder2d (1.0~rc1-4) unstable; urgency=low + + * updated build dependancies to use libguichan2 instead of libguichan1 (Closes: #442957) + + -- Bjørn Hansen Thu, 27 Sep 2007 03:24:31 +0000 + +balder2d (1.0~rc1-3) unstable; urgency=low + + * FTBFS: Incorrect version build-depends for libboost-filesystem-dev (Closes: #434039) + * FTBFS: unmet b-dep libguichan0-dev (Closes: #436334) + + -- Bjørn Hansen Tue, 14 Aug 2007 00:22:12 +0000 + +balder2d (1.0~rc1-2) unstable; urgency=low + + * fixed balder2d fails to run with current libguichan0 (0.6.x-x) (Closes: #427904) + * fixed FTBFS with new libboost (Closes: #425069) + * fixed FTBFS with GCC 4.3: missing #includes (Closes: #418620) + * fixed typo in manpage (Closes: #418871) + + -- Bjørn Hansen Thu, 05 Jul 2007 01:14:46 +0000 + +balder2d (1.0~rc1-1) unstable; urgency=low + + * Initial release + * This is my first Debian package. + + -- Bjørn Hansen Sat, 14 Oct 2006 15:33:42 -0700 + --- balder2d-1.0.orig/debian/compat +++ balder2d-1.0/debian/compat @@ -0,0 +1 @@ +4 --- balder2d-1.0.orig/debian/control +++ balder2d-1.0/debian/control @@ -0,0 +1,46 @@ +Source: balder2d +Section: games +Priority: optional +Maintainer: Bjørn Hansen +Build-Depends: debhelper (>= 4.0.0), scons, libphysfs-dev, libguichan-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libstdc++6, python-dev (>= 2.4), libtinyxml-dev +Standards-Version: 3.8.0 +Homepage: http://balder.sourceforge.net/balder2d/ + +Package: balder2d +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, balder2d-data +Description: A 2D shooter in zero gravity + In Balder2D, players control small probes which shoot tiny projectiles with + which they try to destroy each other. It features a 2D overhead view of the + playing field. Probes may be human or computer controlled. + . + A probe can perform the following actions: + . + * rotate + * fire projectiles + * "stick" to a wall + * push off of a wall + . + Players may rotate their probes while in flight, but the only way to change + the direction or speed of flight is by firing projectiles (which gives a + small kick in the opposite direction) or by running into walls or other probes. + +Package: balder2d-data +Architecture: all +Description: data files for balder2d + In Balder2D, players control small probes which shoot tiny projectiles with + which they try to destroy each other. It features a 2D overhead view of the + playing field. Probes may be human or computer controlled. + . + A probe can perform the following actions: + . + * rotate + * fire projectiles + * "stick" to a wall + * push off of a wall + . + Players may rotate their probes while in flight, but the only way to change + the direction or speed of flight is by firing projectiles (which gives a + small kick in the opposite direction) or by running into walls or other probes. + . + These are the common files for balder2d. --- balder2d-1.0.orig/debian/copyright +++ balder2d-1.0/debian/copyright @@ -0,0 +1,47 @@ +This package was debianized by Bjørn Hansen on +Sat, 14 Oct 2006 15:33:42 -0700. + +Copyright Holder: 2006 Bjørn Hansen + +License: +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL'. + +balder2d can be downloaded from http://balder.sourceforge.net/balder2d/ + +balder2d also includes SFont and Tinyxml: + +SFont is a simple font-library that uses special bitmaps as fonts + Copyright (C) 2003 Karl Bartel + + License: GPL or LGPL (at your choice) + WWW: http://www.linux-games.com/sfont/ + +TinyXml is a simple, small, minimal, C++ XML parser that can be easily +integrating into other programs. The license and copyright info for TinyXml +follows: + +www.sourceforge.net/projects/tinyxml +Original code (2.0 and earlier )copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com) + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must +not claim that you wrote the original software. If you use this +software in a product, an acknowledgment in the product documentation +would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and +must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source +distribution. + --- balder2d-1.0.orig/debian/docs +++ balder2d-1.0/debian/docs @@ -0,0 +1 @@ +README.TXT --- balder2d-1.0.orig/debian/menu +++ balder2d-1.0/debian/menu @@ -0,0 +1,4 @@ +?package(balder2d):needs="X11" section="Games/Arcade"\ + title="balder2d" command="/usr/games/balder2d" \ + longtitle="2D shooter in Zero G" icon="/usr/share/pixmaps/balder2d.xpm" + --- balder2d-1.0.orig/debian/rules +++ balder2d-1.0/debian/rules @@ -0,0 +1,122 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 +DESTDIR=$(CURDIR)/debian/tmp + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + rm -rf src/tinyxml + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + scons + #docbook-to-man debian/balder2d.sgml > balder2d.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + scons -c + rm -f scons-signatures* + + dh_clean + +install: build install-indep install-arch + +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + + # Add commands here to install the data files to debian/tmp. + # DESTDIR=$(CURDIR)/debian/tmp is defined above + mkdir -p $(DESTDIR)/usr/share/games/balder2d + cp -r $(CURDIR)/bin/* $(DESTDIR)/usr/share/games/balder2d/ + rm $(DESTDIR)/usr/share/games/balder2d/balder2d + rm $(DESTDIR)/usr/share/games/balder2d/maps/balder2d_export.py + rm $(DESTDIR)/usr/share/games/balder2d/scripts/test/* + rmdir $(DESTDIR)/usr/share/games/balder2d/scripts/test + + dh_install -i + +install-arch: + dh_testdir + dh_testroot + dh_clean -k -s + dh_installdirs -s + # Add commands here to install the binary files to debian/tmp. + # DESTDIR=$(CURDIR)/debian/tmp is defined above + mkdir -p $(DESTDIR)/usr/lib/balder2d + cp $(CURDIR)/bin/balder2d $(DESTDIR)/usr/lib/balder2d + mkdir -p $(DESTDIR)/usr/games + cp $(CURDIR)/run_balder.sh $(DESTDIR)/usr/games/balder2d + mkdir -p $(DESTDIR)/usr/share/applications/ + cp $(CURDIR)/Balder2D.desktop $(DESTDIR)/usr/share/applications/ + mkdir -p $(DESTDIR)/usr/share/pixmaps/ + cp $(CURDIR)/bin/balder2d.xpm $(DESTDIR)/usr/share/pixmaps/ + + dh_install -s + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installchangelogs history.txt -a + dh_installdocs -a + dh_installman debian/balder2d.6 -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- balder2d-1.0.orig/src/configmanager.cpp +++ balder2d-1.0/src/configmanager.cpp @@ -20,7 +20,7 @@ #include "configmanager.h" #include "renderer.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" #include using namespace Balder; --- balder2d-1.0.orig/src/mapparser.cpp +++ balder2d-1.0/src/mapparser.cpp @@ -21,7 +21,7 @@ #include "log.h" #include "mapparser.h" #include "gamemanager.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" #include "filepathmanager.h" using namespace Balder;