--- armagetronad-0.2.8.3~rc3.orig/debian/TODO +++ armagetronad-0.2.8.3~rc3/debian/TODO @@ -0,0 +1,2 @@ +* Merge relevant changes with upstream. + --- armagetronad-0.2.8.3~rc3.orig/debian/rules +++ armagetronad-0.2.8.3~rc3/debian/rules @@ -0,0 +1,203 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# (C) 2007 Christine Spang +# (C) 2002 Andreas Bombe +# (C) 2000 Marcelo E. Magallon +# Based on sample debhelper rules file, written and released to the +# Public Domain by Joey Hess. + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS +#export CXX=g++-4.3 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS := -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# I'm going to assume that this is still true - armagetron relies on +# arithmetics with denormals. +ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),alpha) + CFLAGS += -mieee +endif + +# Special options to ./configure for client and server builds. +SHARED_OPTS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc --datadir=/usr/share --disable-games --bindir=/usr/games --enable-binreloc CXXFLAGS="$(CFLAGS)" CFLAGS="$(CFLAGS)" +SERVER_OPTS := --disable-glout --disable-useradd --disable-init +CLIENT_OPTS := --enable-glout + +INSTALL_EXECUTABLE := install -m 0755 -o root -g root + +build: patch build-client build-server + +build-client: build-client-stamp +build-client-stamp: configure-client + dh_testdir + $(MAKE) -C client + touch $@ + +configure-client: configure-client-stamp +configure-client-stamp: configure-common + dh_testdir + mkdir client || true + cd client && ../configure $(SHARED_OPTS) $(CLIENT_OPTS) + touch $@ + +build-server: build-server-stamp +build-server-stamp: configure-server + dh_testdir + $(MAKE) -C server + touch $@ + +configure-server: configure-server-stamp +configure-server-stamp: configure-common + dh_testdir + mkdir server || true + cd server && ../configure $(SHARED_OPTS) $(SERVER_OPTS) + touch $@ + +configure-common: +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-client-stamp configure-client-stamp + rm -f build-server-stamp configure-server-stamp + rm -rf client server debian/tmp-client debian/tmp-server + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +install: install-client install-dedicated install-common + +install-client: build-client-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -parmagetronad + + # Add here commands to install the arch part of the package into + # debian/tmp-client. + $(MAKE) -C client DESTDIR=$(CURDIR)/debian/tmp-client install + + # Fix weird stuff that can't be corrected in the upstream makefile. + test -d debian/tmp-client/usr/share/games || mkdir -p debian/tmp-client/usr/share/games + cp -r debian/tmp-client/usr/share/armagetronad debian/tmp-client/usr/share/games/armagetronad + cp -r debian/tmp-client/usr/games/armagetronad debian/tmp-client/usr/games/armagetronad.real + +install-common: build-client-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -parmagetronad-common + +install-dedicated: build-server-stamp + # Commands here to install the server. + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -parmagetronad-dedicated + + $(MAKE) -C server DESTDIR=$(CURDIR)/debian/tmp-server install + mv debian/tmp-server/usr/games/armagetronad-dedicated debian/tmp-server/usr/games/armagetronad-dedicated.real + +binary-arch: armagetronad armagetronad-dedicated + +binary-indep: armagetronad-common + +armagetronad: DH_OPTIONS = -parmagetronad +armagetronad: build install + dh_testdir + dh_testroot + $(INSTALL_EXECUTABLE) debian/armagetronad.wrapper debian/armagetronad/usr/games + mv debian/armagetronad/usr/games/armagetronad.wrapper debian/armagetronad/usr/games/armagetronad + dh_install -parmagetronad --sourcedir=debian/tmp-client + # Convert icon to xpm format. + convert debian/armagetronad/usr/share/pixmaps/armagetronad/icons/medium/armagetronad.png debian/armagetronad/usr/share/pixmaps/armagetronad.xpm + # Fix .desktop file. + sed 's/Path=\/usr\/bin/Path=\/usr\/games/' -i debian/armagetronad/usr/share/applications/armagetronad.desktop + sed 's/Icon=armagetronad.png/Icon=\/usr\/share\/pixmaps\/armagetronad\/icons\/large\/armagetronad.png/' -i debian/armagetronad/usr/share/applications/armagetronad.desktop + sed 's/Categories=Application\;Game\;ActionGame\;GameAction\;ActionGames\;GamesAction\;/Categories=Game\;ActionGame;/' -i debian/armagetronad/usr/share/applications/armagetronad.desktop + # Clean up cruft. + rm -rf debian/armagetronad/usr/share/games/armagetronad/desktop + dh_installchangelogs ChangeLog + dh_installdocs + dh_installmenu + dh_installman debian/armagetronad.6 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +armagetronad-common: DH_OPTIONS = -parmagetronad-common +armagetronad-common: build install + dh_testdir + dh_testroot + dh_install -parmagetronad-common --sourcedir=debian/tmp-client + # There's no reason to ship this script. + rm debian/armagetronad-common/usr/share/games/armagetronad/language/update.py + dh_installchangelogs ChangeLog + dh_installdocs + dh_installmenu + dh_installman + rm debian/armagetronad-common/etc/armagetronad/rc.config + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +armagetronad-dedicated: DH_OPTIONS = -parmagetronad-dedicated +armagetronad-dedicated: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + $(INSTALL_EXECUTABLE) debian/armagetronad-dedicated.wrapper debian/armagetronad-dedicated/usr/games + mv debian/armagetronad-dedicated/usr/games/armagetronad-dedicated.wrapper debian/armagetronad-dedicated/usr/games/armagetronad-dedicated + dh_install --sourcedir=debian/tmp-server -parmagetronad-dedicated + dh_installdocs + dh_installmenu + dh_installman debian/armagetronad-dedicated.6 + dh_installinit + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch armagetronad armagetronad-dedicated armagetronad-common binary install install-common install-client install-dedicated --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.default +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.default @@ -0,0 +1,17 @@ +# 0 = don't start, 1 = start +ARMAGETRONAD_SERVER_START=0 +# User to run as. +ARMAGETRONAD_USER=armagetronad +# Directories for variable data. +VARDIR=/var/games/armagetronad +# Directories for pid and log files. +PIDDIR=/var/games/armagetronad +LOGDIR=/var/log +# pidfile names. +NAME=armagetronad-dedicated +STARTERPIDFILE=$PIDDIR/$NAME-starter.pid +MAINPIDFILE=$PIDDIR/$NAME.pid +# Logfile. +LOGFILE=$LOGDIR/$NAME.log +# Niceness level of the server. +NICENESS="-5" --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad.install +++ armagetronad-0.2.8.3~rc3/debian/armagetronad.install @@ -0,0 +1,6 @@ +usr/games/armagetronad.real usr/games/ +usr/share/games/armagetronad/desktop/icons usr/share/pixmaps/armagetronad +usr/share/games/armagetronad/desktop/armagetronad.desktop usr/share/applications +usr/share/games/armagetronad/models +usr/share/games/armagetronad/sound +usr/share/games/armagetronad/textures --- armagetronad-0.2.8.3~rc3.orig/debian/watch +++ armagetronad-0.2.8.3~rc3/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/armagetronad/armagetronad-(.*)\.src\.tar\.gz --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-common.docs +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-common.docs @@ -0,0 +1 @@ +debian/tmp-client/usr/share/doc/armagetronad/html --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.links +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.links @@ -0,0 +1,2 @@ +usr/share/man/man6/armagetronad-dedicated.6 usr/share/man/man6/armagetronad-dedicated.real.6 +etc/armagetronad etc/armagetronad-dedicated --- armagetronad-0.2.8.3~rc3.orig/debian/README.Debian +++ armagetronad-0.2.8.3~rc3/debian/README.Debian @@ -0,0 +1,19 @@ +armagetron for Debian +--------------------- + +Armagetron is hosted at http://sourceforge.net/projects/armagetronad/ + +There are several mailing lists available. Subscription information and +archives are available via http://sourceforge.net/mail/?group_id=6185. +The available lists are: + + armagetron-announce: new major releases are announced here. + + armagetron-users: meetings, technical questions, etc. + + armagetron-devel: helping with the development of the game. + +And, btw, ArmageTron *does* have online help (a rather cool one). Just wait +for a bit without changing the selected option. + + -- Andreas Bombe , Wed Jun 25 22:31:05 2003 --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.6 +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.6 @@ -0,0 +1,67 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH ARMAGETRONAD-DEDICATED 6 "February 08, 2007" +.SH NAME +armagetronad-dedicated \- an Armagetron Advanced dedicated game server +.SH SYNOPSIS +.B /etc/init.d/armagetronad-dedicated \{start|stop|restart|force-reload|status\} +.PP +\fBarmagetronad-dedicated\fP [\fB\-h, \-\-help\fP] [\fB\-v, \-\-version\fP] [\fB\-\-doc\fP] [\fB\-\-fastforward\fP] [\fB\-\-benchmark\fP] [\fB\-\-record\fP] [\fB\-\-playback\fP] +.SH DESCRIPTION +.PP +The Armagetron Advanced dedicated server runs from an initscript -- +to enable running it on boot, edit \fB/etc/default/armagetronad-dedicated\fP. +.PP +The server program will read default settings from +\fB/etc/armagetronad/settings_dedicated.cfg\fP. Modifications and custom +server settings should be implemented in the file +\fB/etc/armagetronad/settings_custom.cfg\fP. +.PP +To edit configuration on-the-fly or make time-sensitive temporary +changes, it's best to log onto the server from the armagetronad +client and log on as an administrator (using the password set in +the server configuration). Console input is not available when +running the server as a daemon. +.PP +Before each round is started, the file \fB/etc/armagetronad/everytime.cfg\fP +is read; it may be useful to use this for things like randomly +changing maps or other quickly changing settings. +.SH OPTIONS +Note: Only options that are relevant for invoking armagetron-dedicated +via the command line (and not the initscript) are documented here. See +\fBarmagetronad-dedicated --help\fP for a complete reference. +.IP "\fB\-h, \-\-help\fP" 10 +Show help message. +.IP "\fB\-v, \-\-version\fP" 10 +Print version number. +.IP "\fB\-\-doc\fP" 10 +Print documentation for all console commands. These are also configuration +settings for config files. +.IP "\fB\-\-fastforward \fITIME\fR\fP" 10 +Lets time run very fast until the given time is reached. +.IP "\fB\-\-benchmark\fP" 10 +Renders frames as they were recorded. +.IP "\fB\-\-record \fIFILENAME\fP" 10 +Creates a DEBUG recording while running. +.IP "\fB\-\-playback \fIFILENAME\fP" 10 +Plays back a DEBUG recording. +.SH FILES +.TP 3n +\fI/etc/armagetronad/settings_dedicated.cfg\fP +.SH SEE ALSO +armagetronad(6) +.PP +Armagetron Advanced is documented fully by the provided HTML docs, found +under /usr/share/doc/armagetronad-common/html/. +.PP +A thorough guide to running a server can be found on the Armagetron +Advanced wiki: +http:\/\/wiki.armagetronad.net\/index.php\/Server_Administration_Guide +and: +http:\/\/wiki.armagetronad.net\/index.php\/Advanced_Server_Administration_Guide +.SH AUTHOR +Armagetron Advanced was written by Manuel Moos +and the Armagetron Advanced development team. +.PP +This manual page was adapted from the original HTML version by Marcelo +E. Magallon (and later Christine Spang ), +for the Debian GNU/Linux system (but may be used by others). --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-common.doc-base +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-common.doc-base @@ -0,0 +1,9 @@ +Document: armagetronad +Title: Armagetron Manual - A 3D Tron-like high speed game +Author: Manuel Moss +Abstract: Users manual for Armagetron, A 3D Tron-like high speed game. +Section: Games/Action + +Format: HTML +Index: /usr/share/doc/armagetronad-common/html/index.html +Files: /usr/share/doc/armagetronad-common/html/*.html --- armagetronad-0.2.8.3~rc3.orig/debian/changelog +++ armagetronad-0.2.8.3~rc3/debian/changelog @@ -0,0 +1,413 @@ +armagetronad (0.2.8.3~rc3-1) unstable; urgency=low + + * New upstream release candidate. (Closes: #521187) + * Drop armagetron-* dummy packages for squeeze. + * Reformat some descriptions in debian/control which had long lines. + + -- Christine Spang Fri, 11 Sep 2009 20:45:56 -0400 + +armagetronad (0.2.8.2.1-10) unstable; urgency=low + + * Copy over updated config.sub/config.guess during configure + rather than clean rule (Closes: #482723) + + -- Christine Spang Tue, 08 Jul 2008 11:58:23 -0400 + +armagetronad (0.2.8.2.1-9) unstable; urgency=low + + * Clean up some unnecessary includes in 00_gcc-4.3 patch. + * Make armagetron-common remove stale conffiles from old + non-dummy package on purge. (Closes: #454398) + + -- Christine Spang Fri, 01 Feb 2008 10:43:18 -0500 + +armagetronad (0.2.8.2.1-8) unstable; urgency=low + + * Sync packaging fixes with experimental. + - Update 00_gcc-4.3 patch so we really actually can build with gcc 4.3. + (Closes: #454857) + + -- Christine Spang Sat, 26 Jan 2008 21:30:24 -0500 + +armagetronad (0.2.8.2.1-7) unstable; urgency=low + + * A better solution for the adduser dilemma: Depend on adduser + and use deluser in armagetronad-dedicated's prerm rather than + postrm. Thanks, Ari. + + -- Christine Spang Fri, 06 Jul 2007 20:53:15 +0000 + +armagetronad (0.2.8.2.1-6) unstable; urgency=low + + * armagetronad-dedicated Pre-Depends on adduser since its postinst uses it. + * Use userdel rather than deluser to remove the armagetronad system + user. (Closes: #431511) + * Use ${source:Version} instead of the deprecated ${Source-Version} in + debian/control + * Use [ ! -f Makefile ] || $(MAKE) distclean instead of ignoring distclean + errors. Thanks, lintian. + + -- Christine Spang Wed, 04 Jul 2007 21:45:00 +0000 + +armagetronad (0.2.8.2.1-5) unstable; urgency=low + + * Added debian/watch. + + -- Christine Spang Tue, 01 May 2007 16:04:25 -0400 + +armagetronad (0.2.8.2.1-4) unstable; urgency=low + + * Remove bashism in armagetronad-dedicated initscript. (Closes: #420715) + * Really fix the .desktop file's icon path. No, really. (Closes: #420730) + * Remove some cruft from debian/ + * Build-Depend on quilt (>= 0.40). Thanks, lintian. + + -- Christine Spang Tue, 24 Apr 2007 11:38:26 -0400 + +armagetronad (0.2.8.2.1-3) unstable; urgency=low + + * Set the armagetronad user's shell to /bin/false in the + armagetronad-dedicated package's postinst. + * Fix .desktop icon path. + * Fix /etc/armagetronad-dedicated symlink in armagetronad-dedicated.links + (Closes: #420453) + * Use quilt to manage patches. + * Incorporate patch to fix building with gcc 4.3, thanks to Martin + Michlmayr. (Closes: #417103) + + -- Christine Spang Sun, 22 Apr 2007 15:28:54 -0400 + +armagetronad (0.2.8.2.1-2) unstable; urgency=low + + * Change my maintainer e-mail address. + * Upload to unstable. + + -- Christine Spang Tue, 10 Apr 2007 11:25:58 -0400 + +armagetronad (0.2.8.2.1-1) experimental; urgency=low + + * New maintainer. (Closes: #402225) + * Acknowledge NMU. Thanks Petter! (Closes: #325110, #318998, #311736) + * Updated to Standards-Version 3.7.2.2. + * Fixed minor grammar mistake in manpage. + * armagetron.menu updates: + - made more readable + - properly update menus in armagetron.{postinst,postrm} + - added menu hints (Closes: #312905) + * New upstream version. (Closes: #325101) + - Fixes security bugs: + - CAN-2005-0371 (Closes: #296840) + - CVE-2006-3673 (Closes: #379062) + - CVE-2006-3674 + * Updated dependencies. + * Remove now-unnecessary g++ 4.0 patch and remove dependency + on dpatch. + * Almost completely rewrite debian/rules since so many changes + have occurred since last release. + - Add {armagetron,armagetron-common,armagetron-server}.install + and use dh_install to install files into separate tmpdirs. + - Add armagetron-common.docs and use dh_installdocs. + - Use dh_link and add appropriate files. + * Clean up debian/copyright. + * Upstream has changed names. Renamed packages. + * Removed old armagetron.xpm in debian/ and instead use the shipped + medium PNG file for the Debian menu (converted to XPM during build). + * Added lsb-compliant initscript and default file for armagetronad-server. + * Removed cruft from pre/post-inst scripts. + * Improved package descriptions. + * Migrated old armagetron packages to dummy upgrade packages. + * Almost completely rewrote manpages for both armagetronad and + armagetronad-dedicated. + * Fix bug in server initscript so startup honours setting in + /etc/default/armagetronad-dedicated. + * Don't start the server if it's already running. + + -- Christine Spang Mon, 5 Mar 2007 10:25:44 -0500 + +armagetron (0.2.7.0-1.1) unstable; urgency=low + + * Non-maintainer upload with approval from the maintainer to move + this package to the new C++ ABI. + * Convert to use dpatch for use by the new patch, add build-depend + on dpatch. + * Fix C++ build problem. (Closes: #318998) + * Correct grammar in package description. (Closes: #311736) + * Add quotes to needs, section and icon field in the menu file to + avoid lintian/linda warning. + * Avoid multiline build-depend, move it all to one long line to + avoid lintian warning. + * Updated config.sub and config.guess to make sure it build on as + many platforms as possible. + * Correct the upstream URL in README.Debian to match the one in the + copyright file. + + -- Petter Reinholdtsen Fri, 26 Aug 2005 08:55:46 +0200 + +armagetron (0.2.7.0-1) unstable; urgency=high + + * Apply security patch from upstream to fix out-of-bounds array access + (CAN-2005-0369) and DOS by empty UDP packets (CAN-2005-0370). + (closes: #295294) + * Acknowledge NMU. (closes: #263331) + * New upstream is Armagetron Advanced, change all references. + (closes: #275838) + * Fix contents of copyright file. Also fix upgrade from 0.1 versions of the + package by moving the /usr/share/doc directories out of the way to allow + them to be replaced with symlinks. (closes: #290051) + * Use absolute path in armagetron menu entry. (closes: #243538) + * Make the wrappers more robust with respect to directory creation. + (closes: #250070) + + -- Andreas Bombe Fri, 25 Feb 2005 01:48:20 +0100 + +armagetron (0.2.5.2-3.1) unstable; urgency=high + + * Non-maintainer upload. + * Urgency=high because it fixes an RC bug affecting sarge. + * Install the missing shell wrapper for armagetron-dedicated + (closes: #263331). + + -- Steve Langasek Mon, 16 Aug 2004 12:28:25 -0700 + +armagetron (0.2.5.2-3) unstable; urgency=low + + * Compile with -mieee for Alpha to fix floating point exception + there. (closes: #97720) + * Add menu icon converted from textures/icon.png. (closes: #209047) + * Bump Standards-Version to 3.6.1 (no changes necessary). + + -- Andreas Bombe Mon, 9 Feb 2004 01:59:46 +0100 + +armagetron (0.2.5.2-2) unstable; urgency=low + + * src/network/net_udp.cpp: Change typedef NET_SIZE from size_t to proper + type socklen_t. Fixes compilation error on 64 bit platforms. + (closes: #208484) + + -- Andreas Bombe Wed, 3 Sep 2003 15:04:51 +0200 + +armagetron (0.2.5.2-1) unstable; urgency=low + + * New upstream release. (closes: #205077) + * Give general description of the game in the common and dedicated + server package descriptions too. (closes: #202025) + * Fix all calculations where pointers were cast to int to use long int + instead, should hopefully fix 64 bit issues. (closes: #201638) + * Bump Standards-Version to 3.6.0 (no changes necessary). + + -- Andreas Bombe Wed, 3 Sep 2003 04:09:02 +0200 + +armagetron (0.2.2-1) unstable; urgency=low + + * New upstream release. (And there I was wondering that nobody reported + "new version" wishlist bugs, but just wait a few days, and here it is; + closes: #199572) + * Upstream updated to current C++ standards, now compiles with the + current default compiler gcc 3.3. (closes: #196990) + * Fix the reported spelling error in the man pages as well as a few + others and change the web page link to the current address. + (closes:#194966) + * Default config is now in /etc/armagetron. + * Added new armagetron-common package to hold the configuration and + documentation files. + * Bump Standards-Version to 3.5.10 (no changes necessary). + * Do not repeat synopsis in long description of package and change + homepage link to DD Reference's recommended format. + * Remove --keep-going flags from recursive make invocations in + Makefile.in. + * Wrapper script uses new armagetron options to point it to its data + instead of symlink kludge and changing directories. + * Wrapper script creates ~/.armagetron directory for user if it doesn't + exist. + * Removed the obsolete example rc files. + * Changed build dependencies to seperate GL/GLU packages. + * Changed dedicated server binary name to armagetron-dedicated to be + consistent with upstream. + + -- Andreas Bombe Thu, 3 Jul 2003 03:51:38 +0200 + +armagetron (0.1.4.9-9) unstable; urgency=low + + * Fix null dereference in src/render/rScreen.cpp (thanks David Fries, + closes: #174870). + * Bump Debian Standards-Version to 3.5.8 (no changes neccessary). + + -- Andreas Bombe Wed, 8 Jan 2003 01:15:07 +0100 + +armagetron (0.1.4.9-8) unstable; urgency=low + + * New maintainer. (closes: #158975) + * Installing files explicitly to get rid of unwanted files (like + .cvsignore, closes: #159962). + * Wrapper script now execs armagetron instead of running it as a child. + * Moved real armagetron from /usr/lib/armagetron/armagetron to + /usr/games/armagetron.real. + * Moved armagetron-server from /usr/lib/armagetron/armagetron-server to + /usr/games/. + * Added missing build dependency on libsdl1.2-dev (this was usually + pulled in by libsdl-image1.2-dev and therefore unnoticed). + * Bump Standards-Version to 3.5.7.0. + * Setting debhelper compatibility level to 4, removing dh_testversion + call, changing dh_installmanpages to dh_installman. + * Honor $DEB_BUILD_OPTIONS in debian/rules. + * Make armagetron-server description less ambiguous. + + -- Andreas Bombe Fri, 20 Sep 2002 05:22:50 +0200 + +armagetron (0.1.4.9-7) unstable; urgency=low + + * debian/control: update URL in description + + -- Marcelo E. Magallon Sat, 31 Aug 2002 11:49:40 +0200 + +armagetron (0.1.4.9-6) unstable; urgency=low + + * debian/copyright: update URL (thanks Leonardo) (closes: bug#157978) + * src/tron/gGame.cpp: typo (thanks Stephen Williams, sorry about the + delay, I can't remember why I didn't apply this right away) (closes: + bug#130164) + * debian/control: weee! dependency ping-pong! libpng2... no, libpng3... + no, libpng2... actually, remove Build-Conflicts, -4 should have taken + care of this. + + -- Marcelo E. Magallon Sat, 31 Aug 2002 10:06:05 +0200 + +armagetron (0.1.4.9-5) unstable; urgency=low + + * debian/rules: post-operative fixes on the Makefile to remove -lpng and -lz + from the link line. Prevents future breakage. + * debian/control: bump dependency on libsdl-image1.2-dev to 1.2.2-1. + Build-Depend on xlibmesa-dev | libgl1-dev + + -- Marcelo E. Magallon Mon, 22 Jul 2002 08:29:36 +0200 + +armagetron (0.1.4.9-4) unstable; urgency=low + + * recompile with current libsdl-image1.2-dev (someone's got a rather + creative approach to team coordination) + * debian/control: Build-Conflicts libpng2-dev. libsdl-image1.2-dev is + fubar. + + -- Marcelo E. Magallon Sun, 21 Jul 2002 00:57:07 +0200 + +armagetron (0.1.4.9-3) unstable; urgency=low + + * Acknowledge NMU from Martin (thanks!) (closes: bug#132051, bug#123131) + * debian/rules: remove .cvsignore files (closes: bug#124164) + * debian/contro: fix typo (closes: bug#124418) + * Fixed typos (thanks Stephen Williams) + + -- Marcelo E. Magallon Sun, 3 Feb 2002 17:29:40 +0100 + +armagetron (0.1.4.9-2.1) unstable; urgency=low + + * NMU + * Applied patch from Jamie Wilkinson to fix build errors on + alpha (Closes: #123131). + + -- Martin Michlmayr Sun, 03 Feb 2002 14:06:47 +0100 + +armagetron (0.1.4.9-2) unstable; urgency=low + + * configure: s/==/=/, won't build correctly if /bin/sh is ash + (closes: bug#121709) + * src/network/net_udp.cpp: use socklen_t insatead of size_t (closes: + bug#121829) + + -- Marcelo E. Magallon Sat, 8 Dec 2001 17:43:52 +0100 + +armagetron (0.1.4.9-1) unstable; urgency=low + + * New upstream version. + * Tweaked Michael's patch a bit to get it to apply to the current sources. + (closes: bug#115209) + * Rebuild with current SDL. + * src/tools/memmanager.h: new operator takes size_t as first argument, + not unsigned int. (thanks Robert) (closes: bug#85968, bug#112660, + bug#114036) + * Build-depend on newest libsdl-image1.2-dev to pick up correct + libsdl-image1.2 dependency. (closes: bug#115523) + * HTML files shipped as HTML. (closes: bug#104016) + * debian/control: add b-dep on autotools-dev + * debian/rules: use config.guess and config.sub from autotools-dev + + -- Marcelo E. Magallon Sun, 11 Nov 2001 18:38:10 +0100 + +armagetron (0.1.4.3-5) unstable; urgency=low + + * debian/control: play arround with build dependencies. Use SDL 1.2. + + -- Marcelo E. Magallon Thu, 7 Jun 2001 20:56:09 +0200 + +armagetron (0.1.4.3-4) unstable; urgency=low + + * ARGH! Forgot to include the proper replaces in debian/control because + of the fix for #84373 + + -- Marcelo E. Magallon Sat, 3 Feb 2001 23:02:07 +0100 + +armagetron (0.1.4.3-3) unstable; urgency=low + + * debian/rules: get dh_installmanpages syntax right (closes: bug#84373) + * *sigh*, more size_t bugs (thanks Paul) (closes: bug#84358) + + -- Marcelo E. Magallon Thu, 1 Feb 2001 21:22:59 +0100 + +armagetron (0.1.4.3-2) unstable; urgency=low + + * src/network/net_udp.cpp: s/size_t/socklen_t/ (closes: bug#84012) + + -- Marcelo E. Magallon Mon, 29 Jan 2001 21:41:29 +0100 + +armagetron (0.1.4.3-1) unstable; urgency=low + + * New upstream release. + * debian/rules: use src/tron/armagetron instead of src/armagetron for + the binary. + + -- Marcelo E. Magallon Wed, 24 Jan 2001 01:24:55 +0100 + +armagetron (0.1.3.20000730-4) unstable; urgency=low + + * Recompiled with new libsdl-image1.1 (did I forget to upload the last + one?) (closes: bug#79564) + * Fixed extra space in doc-help section + + -- Marcelo E. Magallon Wed, 18 Oct 2000 23:10:20 +0200 + +armagetron (0.1.3.20000730-3) unstable; urgency=low + + * Recompiled with new libsdl-image1.1 from CTS + + -- Marcelo E. Magallon Wed, 18 Oct 2000 23:10:20 +0200 + +armagetron (0.1.3.20000730-2) unstable; urgency=low + + * The great blooper fixup. + * Recompiled with new libsdl-image1.1 (thanks cts!) (closes: bug#75069) + * Hmmm... libsdl-image1.1 removed the inversion of alpha. Remove here + likewise. + * src/textures.cpp: accept 8 bpp images (GL_LUMINANCE) + * Oops. Armagetron's server manpage is not there. Make one. (closes: + bug#74505) + * debian/rules: add armagetron-server.6 manpage. + * debian/rules: Moved data files to /usr/share/games/armagetron/ (closes: + bug#74517) + * debian/menu: zap /usr/bin (closes: bug#74576) + * debian/armagetron.6: added link to website. + + -- Marcelo E. Magallon Wed, 18 Oct 2000 23:10:20 +0200 + +armagetron (0.1.3.20000730-1) unstable; urgency=low + + * New upstream release. + + -- Marcelo E. Magallon Tue, 3 Oct 2000 09:43:25 +0200 + +armagetron (0.1.3-0) unstable; urgency=low + + * Initial Release. + + -- Marcelo E. Magallon Sun, 30 Jul 2000 21:46:08 +0200 + + --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad.dirs +++ armagetronad-0.2.8.3~rc3/debian/armagetronad.dirs @@ -0,0 +1,4 @@ +usr/share/pixmaps/armagetronad +usr/share/games +usr/share/applications +usr/games --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.postinst +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.postinst @@ -0,0 +1,10 @@ +#!/bin/sh -e + +# Create armagetronad user if it isn't already there. +if [ ! `getent passwd armagetronad` > /dev/null ] +then + echo 'Adding system user for armagetronad' 1>&2 + adduser --system --quiet --disabled-password --shell /bin/false --home /var/games/armagetronad --ingroup games armagetronad +fi + +#DEBHELPER# --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.init +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.init @@ -0,0 +1,93 @@ +#! /bin/sh +# +# start/stop armagatronad dedicated server. + +### BEGIN INIT INFO +# Provides: armagetronad-server +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Armagetron Advanced dedicated server +# Description: Runs the Armagetron Advanced dedicated game +# server. +### END INIT INFO + +# Author: Christine Spang + +NAME=armagetronad-dedicated + +ARMAGETRONAD_SERVER_START=1 + +# Include armagetronad configuration variables if present. +[ -r /etc/default/$NAME ] && . /etc/default/$NAME +PATH=/usr/games:/usr/bin:/usr/sbin:/sbin:/bin + +DAEMON="/usr/games/$NAME" +DESC="Armagetron Advanced dedicated server" +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package has been removed. +[ -x "$DAEMON" ] || exit 0 + +# Load the VERBOSE setting and other rcS variables. +. /lib/init/vars.sh + +# Define LSB functions. +. /lib/lsb/init-functions + +# Don't start if /etc/default/armagetronad-server says not to. +if [ "$ARMAGETRONAD_SERVER_START" != "1" -a "$1" != "stop" ]; then + echo "Not starting $DESC $NAME, disabled via /etc/default/$NAME" + exit 0 +fi + +run() +{ + /sbin/start-stop-daemon --start --quiet --chuid $ARMAGETRONAD_USER --oknodo --pidfile $STARTERPIDFILE --nicelevel $NICENESS --exec $DAEMON >$LOGFILE & +} + +case "$1" in + start) + if [ -r $MAINPIDFILE ]; then + log_warning_msg "$DESC is already running; not starting." + else + log_daemon_msg "Starting $DESC" "$NAME" + run + log_end_msg $? + fi + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + # Kill both the starter keepalive script and server. + /sbin/start-stop-daemon --stop --pidfile $STARTERPIDFILE --quiet --oknodo $DAEMON + /sbin/start-stop-daemon --stop --pidfile $MAINPIDFILE --quiet --oknodo $DAEMON.real + log_end_msg $? + rm -f $STARTERPIDFILE $MAINPIDFILE + ;; + restart|force-reload) + $0 stop + $0 start + ;; + reload) + exit 3 + ;; + status) + [ -e $MAINPIDFILE ] + status=$? + if [ $status -eq 0 ]; then + log_success_msg "$DESC is running." + else + log_failure_msg "$DESC is not running." + fi + exit $status + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 --- armagetronad-0.2.8.3~rc3.orig/debian/NEWS +++ armagetronad-0.2.8.3~rc3/debian/NEWS @@ -0,0 +1,11 @@ +armagetronad (0.2.8.2.1-1) unstable; urgency=low + + * Incompatible Changes in 0.2.8.2.1 + - This latest version of Armagetron Advanced doesn't support migrating + user-specific configuration (from $HOME/.armagetron). New config files + are found in $HOME/.armagetronad; changes like controls and video + card settings must be done again. + - Also, the old armagetron packages have been converted to dummy + packages for upgrade purposes. + + -- Christine Spang Sun, 04 Feb 2007 15:41:14 -0500 --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.dirs +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.dirs @@ -0,0 +1,2 @@ +usr/games +etc --- armagetronad-0.2.8.3~rc3.orig/debian/README.source +++ armagetronad-0.2.8.3~rc3/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt and debhelper. See /usr/share/doc/quilt/README.source +for details on this source packaging format. --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.wrapper +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.wrapper @@ -0,0 +1,60 @@ +#!/bin/bash -e + +REALTRON=/usr/games/armagetronad-dedicated.real + +DATADIR=/usr/share/games/armagetronad +CONFDIR=/etc/armagetronad + +CMDLINE="--datadir $DATADIR --configdir $CONFDIR -d" + +# Source configuration variables. +. /etc/default/armagetronad-dedicated + +# Array for keeping track of start times. +declare -a STARTDATE_LOG + + +function run() +{ + exec $REALTRON $CMDLINE $* & + echo `jobs -p` > $MAINPIDFILE + wait + echo Terminated +} + +function run_continuous() +{ + echo $$ > $STARTERPIDFILE + while true; do + STARTDATE=`date +%s` + run + + # Give up if restarts come too quickly; ten per minute is suspicious. + OLDESTART=${STARTDATE_LOG[1]} + if [ ! -z "$OLDESTSTART" ]; then + TIMESPENT=$(($STARTDATE - $OLDESTSTART)) + if [ ${TIMESPENT} -lt 60]; then + echo "Stopping server, it is restarting too quickly." + rm -f $STARTERPIDFILE + rm -f $MAINPIDFILE + exit + fi + fi + + # Keep log of past start dates. + for f in 1 2 3 4 5 6 7 8 9; do + next=$(( $f + 1)) + STARDATE_LOG[$f]=${STARTDATE_LOG[$next]} + done + STARTDATE_LOG[10]=${STARTDATE} + done +} + +# Still allow other arguments to be executed, e.g. --doc +if [ "$1" != "" ]; then + exec $REALTRON $CMDLINE $1 $2 $3 + exit 0 +fi + +# Run and keep-alive in case of crashes. +run_continuous --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad.menu +++ armagetronad-0.2.8.3~rc3/debian/armagetronad.menu @@ -0,0 +1,7 @@ +?package(armagetronad):\ + needs="X11"\ + section="Games/Action"\ + title="Armagetron Advanced"\ + command="/usr/games/armagetronad"\ + icon="/usr/share/pixmaps/armagetronad.xpm"\ + hints="3D,Racing,Multiplayer,Tron" --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.install +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.install @@ -0,0 +1 @@ +usr/games/armagetronad-dedicated.real --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad.links +++ armagetronad-0.2.8.3~rc3/debian/armagetronad.links @@ -0,0 +1 @@ +usr/share/man/man6/armagetronad.6 usr/share/man/man6/armagetronad.real.6 --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-common.install +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-common.install @@ -0,0 +1,3 @@ +usr/share/games/armagetronad/language +usr/share/games/armagetronad/resource +etc --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad.6 +++ armagetronad-0.2.8.3~rc3/debian/armagetronad.6 @@ -0,0 +1,56 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH ARMAGETRONAD 6 "February 07, 2007" +.SH NAME +armagetronad \- a 3D Tron-like high speed game +.SH SYNOPSIS +\fBarmagetronad\fP [\fB\-h, \-\-help\fP] [\fB\-v, \-\-version\fP] [\fB\-\-doc\fP] [\fB\-f, \-\-fullscreen\fP] [\fB\-w, \-\-window, \-\-windowed\fP] [\fB\-\-fastforward\fP] [\fB\-\-benchmark\fP] [\fB\-\-record\fP] [\fB\-\-playback\fP] +.SH DESCRIPTION +The rules are simple: you ride a lightcycle (a kind of motorbike that +can only turn 90 degrees at a time, leaves a wall behind and cannot be +stopped). Avoid running into a wall. Make your opponent run into a +wall. This idea comes from the 1982 Disney movie "Tron". +.PP +One thing is different than in other Tron clones: you can accelerate. +However, there is a catch. The only way to accelerate is to drive close +to player walls. This allows for some interesting tactics. Every time you +make a turn, you lose 5% of your speed -- so don't be too nervous, speed +is your only resource against other players! +.PP +First thing you shold do is go into the "Player Menu" to set your name and +your keyboard and mouse configuration. Then, go into the "Game Menu" and +start a single player game against one AI opponent (the game mode does +not really matter here). Then, get some friends together and try the +multiplayer modes! +.PP +\fBSHIFT-ESC\fP is the "boss key" and quits Armagetron as fast as +possible. +.SH OPTIONS +.IP "\fB\-h, \-\-help\fP" 10 +Show help message. +.IP "\fB\-v, \-\-version\fP" 10 +Print version number. +.IP "\fB\-\-doc\fP" 10 +Print documentation for all console commands. These are also configuration +settings for config files. +.IP "\fB\-f \-\-fullscreen\fP" 10 +Start in fullscreen mode. +.IP "\fB\-w \-\-window, \-\-windowed\fP" 10 +Start in windowed mode. +.IP "\fB\-\-fastforward \fITIME\fR\fP" 10 +Lets time run very fast until the given time is reached. +.IP "\fB\-\-benchmark\fP" 10 +Renders frames as they were recorded. +.IP "\fB\-\-record \fIFILENAME\fP" 10 +Creates a DEBUG recording while running. +.IP "\fB\-\-playback \fIFILENAME\fP" 10 +Plays back a DEBUG recording. +.SH SEE ALSO +Armagetron Advanced is documented fully by the provided HTML docs, found under +/usr/share/doc/armagetronad-common/html/. +.SH AUTHOR +Armagetron Advanced was written by Manuel Moos +and the Armagetron Advanced development team. +.P +This manual page was adapted from the original HTML version by Marcelo +E. Magallon , (and later Christine Spang +) for the Debian GNU/Linux system (but may be used by others). --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-dedicated.prerm +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-dedicated.prerm @@ -0,0 +1,11 @@ +#!/bin/sh -e + +if [ $1 = "purge" ]; then + if [ `getent passwd armagetronad` > /dev/null ]; then + echo "Removing armagetronad system user..." + deluser --quiet armagetronad + rm -rf /var/games/armagetronad + fi +fi + +#DEBHELPER# --- armagetronad-0.2.8.3~rc3.orig/debian/copyright +++ armagetronad-0.2.8.3~rc3/debian/copyright @@ -0,0 +1,22 @@ +This package was debianized by Marcelo E. Magallon on +Sun, 30 Jul 2000 21:46:08 +0200. + +It was downloaded from http://sourceforge.net/projects/armagetronad/. + +Upstream Author: Manual Moos and the +Armagetron Advanced development team. + +Copyright: (C) 2000-2007, Manual Moos and the Armagetron Advanced +development team. + +License: + +This software is distributed under the GNU General Public License, version +2 or later. On Debian GNU/Linux systems, the complete text of the GNU +GPL can be found in `/usr/share/common-licenses/GPL'. + + +The Debian packaging is (C) 2000, Marcelo E. Magallon , +(C) 2002 Andreas Bombe , (C) 2007 Christine Spang +. It is licensed under the GPL, see +`/usr/share/common-licenses/GPL'. --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad-common.dirs +++ armagetronad-0.2.8.3~rc3/debian/armagetronad-common.dirs @@ -0,0 +1,3 @@ +etc +usr/share/doc +usr/share/games/armagetronad/language --- armagetronad-0.2.8.3~rc3.orig/debian/armagetronad.wrapper +++ armagetronad-0.2.8.3~rc3/debian/armagetronad.wrapper @@ -0,0 +1,33 @@ +#!/bin/sh -e + +REALTRON=/usr/games/armagetronad.real + +DATADIR=/usr/share/games/armagetronad +CONFDIR=/etc/armagetronad +USERCONFDIR=$HOME/.armagetronad +USERDATADIR=$USERCONFDIR/data +VARDIR=$USERCONFDIR/var + + +if [ ! -d $USERCONFDIR ]; then + # have to create configuration directory + mkdir $USERCONFDIR + + if [ -f $HOME/.ArmageTronrc ]; then + # upgrade from before 0.2 + cp $HOME/.ArmageTronrc $USERCONFDIR/user.cfg + fi +fi + +if [ ! -d $VARDIR ]; then + mkdir $VARDIR +fi + + +CMDLINE="--datadir $DATADIR --configdir $CONFDIR --userconfigdir $USERCONFDIR --vardir $VARDIR" +if [ -d $USERDATADIR ]; then + CMDLINE="$CMDLINE --userdatadir $USERDATADIR" +fi + + +exec $REALTRON $CMDLINE "$@" --- armagetronad-0.2.8.3~rc3.orig/debian/compat +++ armagetronad-0.2.8.3~rc3/debian/compat @@ -0,0 +1 @@ +5 --- armagetronad-0.2.8.3~rc3.orig/debian/control +++ armagetronad-0.2.8.3~rc3/debian/control @@ -0,0 +1,57 @@ +Source: armagetronad +Section: games +Priority: optional +Maintainer: Christine Spang +Standards-Version: 3.8.3 +Build-Depends: quilt (>= 0.40), debhelper (>= 5), imagemagick, pkg-config, + libgl1-mesa-dev, libglu1-mesa-dev, libsdl-image1.2-dev (>= 1.2.2), + libsdl1.2-dev (>= 1.2.2), libsdl-mixer1.2-dev, autotools-dev, libpng12-dev, + zlib1g-dev, libxml2-dev +Homepage: http://armagetronad.sourceforge.net/ + +Package: armagetronad-common +Recommends: armagetronad | armagetronad-dedicated +Architecture: all +Description: Common files for the Armagetron Advanced packages + Armagetron Advanced is a 3D game based on the light cycle racing in the 80s- + era movie "Tron". + . + You have to control a light cycle that can only turn in steps of 90 degrees, + leaves a solid wall behind and can not be stopped. The aim is to survive the + longest of all players by not crashing into any walls. + . + This package contains the common configuration files and documentation shared + between the armagetronad and armagetronad-server packages. + +Package: armagetronad +Architecture: any +Depends: armagetronad-common (= ${source:Version}), ${shlibs:Depends} +Description: 3D Tron-like high speed game + The rules are simple: you ride a light cycle (a kind of motorbike that can + only turn 90 degrees at a time, leaves a wall behind and cannot be stopped) + and have to avoid running into walls while at the same time you have to try to + get your opponent to run into them. + . + The idea is based on the Disney movie from 1982 called "Tron". If you ever + wanted to take a try at one of those speed demons features in the movie, this + is your chance. + . + Armagetron Advanced can be played against AI opponents, against other humans + over the network, or a mixture of both. + +Package: armagetronad-dedicated +Architecture: any +Depends: armagetronad-common (= ${source:Version}), adduser, bash (>= 3), + ${shlibs:Depends}, lsb-base (>= 3.0-6) +Description: dedicated game server for Armagetron Advanced + Armagetron Advanced is a 3D game based on the light cycle racing in the movie + "Tron". You have to control a light cycle that can only turn in steps of 90 + degrees, leaves a solid wall behind and can not be stopped. The aim is to + survive the longest of all players by not crashing into any walls. + . + This version of Armagetron Advanced can only be used as a network game server. + It does not have graphical output and can be controlled via the text console. + . + The normal Armagetron Advanced used for playing is also capable to serve + games, but will require X to display its graphics, will provide a player and + is therefore unsuited for permanent game servers. --- armagetronad-0.2.8.3~rc3.orig/debian/patches/series +++ armagetronad-0.2.8.3~rc3/debian/patches/series @@ -0,0 +1 @@ +# --- armagetronad-0.2.8.3~rc3.orig/debian/patches/.dpkg-source-applied +++ armagetronad-0.2.8.3~rc3/debian/patches/.dpkg-source-applied @@ -0,0 +1,2 @@ +00_gcc-4.3 +debian-changes-0.2.8.2.1-10 --- armagetronad-0.2.8.3~rc3.orig/debian/patches/00_gcc-4.3 +++ armagetronad-0.2.8.3~rc3/debian/patches/00_gcc-4.3 @@ -0,0 +1,265 @@ +Index: armagetronad-0.2.8.2.1/src/tools/tError.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tError.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tError.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -26,6 +26,7 @@ + */ + + #include "config.h" ++#include + #include + #if HAVE_UNISTD_H + #include +Index: armagetronad-0.2.8.2.1/src/tools/tRandom.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tRandom.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tRandom.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -34,6 +34,8 @@ + #include + #endif + ++#include ++ + #include "tError.h" + #include "tRecorder.h" + +Index: armagetronad-0.2.8.2.1/src/tron/gAIBase.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tron/gAIBase.cpp 2008-01-27 23:46:56.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tron/gAIBase.cpp 2008-01-28 12:52:44.000000000 -0500 +@@ -43,6 +43,7 @@ + #include "tRandom.h" + #include "tRecorder.h" + #include ++#include + + #define AI_REACTION 0 + #define AI_EMERGENCY 1 +Index: armagetronad-0.2.8.2.1/src/tron/gCycle.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tron/gCycle.cpp 2008-01-27 23:46:56.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tron/gCycle.cpp 2008-01-28 12:53:17.000000000 -0500 +@@ -52,6 +52,7 @@ + #include "tMath.h" + #include + #include ++#include + + #ifndef DEDICATED + #define DONTDOIT +Index: armagetronad-0.2.8.2.1/src/network/md5.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/network/md5.cpp 2008-01-27 23:46:56.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/network/md5.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -78,6 +78,7 @@ + + #include + #include ++#include + + #ifdef TEST + /* +Index: armagetronad-0.2.8.2.1/src/network/nKrawall.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/network/nKrawall.cpp 2008-01-27 23:46:56.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/network/nKrawall.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -44,6 +44,7 @@ + + #include + #include ++#include + + bool nKrawall::MayRequirePassword(tString& adress, unsigned int port) + { +Index: armagetronad-0.2.8.2.1/src/network/nNetObject.h +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/network/nNetObject.h 2008-01-27 23:46:56.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/network/nNetObject.h 2008-01-28 12:52:34.000000000 -0500 +@@ -31,6 +31,7 @@ + #include "nNetwork.h" + #include "tArray.h" + #include "tConsole.h" ++#include + + class nObserver; + +Index: armagetronad-0.2.8.2.1/src/network/nNetwork.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/network/nNetwork.cpp 2008-01-27 23:46:56.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/network/nNetwork.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -48,6 +48,7 @@ + #endif + + #include ++#include + + // debug watchs + #ifdef DEBUG +Index: armagetronad-0.2.8.2.1/src/network/nSocket.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/network/nSocket.cpp 2008-01-27 23:46:56.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/network/nSocket.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + #ifndef WIN32 + #include +Index: armagetronad-0.2.8.2.1/src/render/rFont.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/render/rFont.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/render/rFont.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -29,6 +29,7 @@ + #include "rScreen.h" + #include "tConfiguration.h" + #include ++#include + + #ifndef DEDICATED + #include "rRender.h" +Index: armagetronad-0.2.8.2.1/src/render/rModel.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/render/rModel.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/render/rModel.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -28,6 +28,7 @@ + #include "rModel.h" + #include + #include ++#include + #include + #include "rScreen.h" + #include "tString.h" +Index: armagetronad-0.2.8.2.1/src/render/rScreen.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/render/rScreen.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/render/rScreen.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -30,6 +30,7 @@ + #include "defs.h" + + #include ++#include + #include "rTexture.h" + #include "rScreen.h" + #include "rSysdep.h" +Index: armagetronad-0.2.8.2.1/src/tools/tArray.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tArray.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tArray.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include "tArray.h" + + void GrowingArrayBase::ComplainIfFull(){ +Index: armagetronad-0.2.8.2.1/src/tools/tCommandLine.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tCommandLine.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tCommandLine.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -34,6 +34,7 @@ + #include "tLocale.h" + #include "tConfiguration.h" + #include "tException.h" ++#include + + #ifdef WIN32 + #include +Index: armagetronad-0.2.8.2.1/src/tools/tConfiguration.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tConfiguration.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tConfiguration.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include "tString.h" + #include "tToDo.h" +Index: armagetronad-0.2.8.2.1/src/tools/tCrypt.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tCrypt.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tCrypt.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -29,6 +29,7 @@ + #include "tMemManager.h" + + #include ++#include + + class tCryptDummy: public tCrypt + { +Index: armagetronad-0.2.8.2.1/src/tools/tDirectories.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tDirectories.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tDirectories.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include "tLocale.h" + #include "tDirectories.h" +Index: armagetronad-0.2.8.2.1/src/tools/tLocale.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tLocale.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tLocale.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -33,6 +33,7 @@ + + #include + #include ++#include + #include + + class tLocaleSubItem; // identifies a single string in a single language +Index: armagetronad-0.2.8.2.1/src/tools/tMemManager.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tMemManager.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tMemManager.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -33,6 +33,7 @@ + #include + #include + #include // need basic C IO since STL IO does memory management ++#include + #include "tMemManager.h" + #include "tError.h" + +Index: armagetronad-0.2.8.2.1/src/tools/tString.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/tools/tString.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/tools/tString.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -31,6 +31,7 @@ + #include "tConfiguration.h" + #include + #include ++#include + #include + + tString::tString(){ +Index: armagetronad-0.2.8.2.1/src/ui/uInput.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/ui/uInput.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/ui/uInput.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -33,6 +33,7 @@ + #include "rConsole.h" + #include "uMenu.h" + #include "tSysTime.h" ++#include + + bool su_mouseGrab = false; + +Index: armagetronad-0.2.8.2.1/src/ui/uInputQueue.cpp +=================================================================== +--- armagetronad-0.2.8.2.1.orig/src/ui/uInputQueue.cpp 2008-01-27 23:46:55.000000000 -0500 ++++ armagetronad-0.2.8.2.1/src/ui/uInputQueue.cpp 2008-01-28 12:52:34.000000000 -0500 +@@ -29,6 +29,7 @@ + #include "rScreen.h" + #include "tConfiguration.h" + #include ++#include + + #ifndef DEDICATED + #include "rSDL.h"