--- qonk-0.3.1.orig/debian/README.source +++ qonk-0.3.1/debian/README.source @@ -0,0 +1,13 @@ +Task: apply debian patches +Tools: quilt +Command: quilt push -a +Description: + Please read /usr/share/doc/quilt/README.source how to use quilt for + managing Debian patches. + . + This might not be needed for there are not always patches. The steps + outlined above should always work nonetheless. If you want to see if + there are patches, check if there are files in debian/patches apart + from the one called «series» + + -- Christoph Egger , Sun, 30 Aug 2009 22:39:52 +0200 --- qonk-0.3.1.orig/debian/manpages +++ qonk-0.3.1/debian/manpages @@ -0,0 +1 @@ +debian/qonk.6 --- qonk-0.3.1.orig/debian/rules +++ qonk-0.3.1/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_AUTO_UPDATE_ACLOCAL = 1.11 +DEB_AUTO_UPDATE_AUTOCONF = 2.61 +DEB_AUTO_UPDATE_AUTOMAKE = 1.11 +DEB_AUTO_UPDATE_LIBTOOL := 1.5 +DEB_AUTO_CLEANUP_RCS := yes +DEB_INSTALL_CHANGELOGS_ALL := HISTORY +DEB_CONFIGURE_EXTRA_FLAGS := --bindir="\$${prefix}/games" \ + --datadir="\$${prefix}/share/games" + +install/qonk:: + rm -rf $(DEB_DESTDIR)/guichan \ + $(DEB_DESTDIR)/usr/share/games/qonk/font.ttf + ln -s ../../fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf \ + $(DEB_DESTDIR)/usr/share/games/qonk/font.ttf + --- qonk-0.3.1.orig/debian/docs +++ qonk-0.3.1/debian/docs @@ -0,0 +1,2 @@ +TODO +README --- qonk-0.3.1.orig/debian/watch +++ qonk-0.3.1/debian/watch @@ -0,0 +1,3 @@ +# See uscan(1) for format +version=3 +http://sf.net/qonk/ qonk-(.+)\.tar\.gz --- qonk-0.3.1.orig/debian/qonk.6 +++ qonk-0.3.1/debian/qonk.6 @@ -0,0 +1,94 @@ +.\" Title: QONK +.\" Author: Martin Ferrari +.\" Generator: DocBook XSL Stylesheets v1.73.2 +.\" Date: 2006-06-19 +.\" Manual: +.\" Source: +.\" +.TH "QONK" "6" "2006\-06\-19" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +qonk - Small build-and-conquer strategy game with very simple rules +.SH "SYNOPSIS" +.HP 5 +\fBqonk\fR [\fB\fInumber\ of\ planets\fR\fR] [\fB\fInumber\ of\ AI\ players\fR\fR] +.SH "DESCRIPTION" +.PP +This manual page was written for the +Debian(TM) +distribution because the original program does not have a manual page\. Most of the text is taken verbatim from the author\'s webpage\. +.PP +\fBqonk\fR +is a small build\-and\-conquer strategy game with very simple rules\. A complete game only lasts for a few minutes and can be a fun break away from work or whatever you\'re doing\. +.PP +The setting of the game is a solar system of planets\. Your goal is to conquer all of the planets in the game by sending ships there\. Planets that are under your control generate new ships\. Simple AI players are playing against you\. As you gain more experience throughout the game, more AI players have to be kicked out of bigger solar systems\. +.PP +The game is currently very much in beta\. The game engine itself is fully functional\. A lot of things have to be added to make this a mature game (like menus and stuff), but since the engine itself works, Qonk is already very playable\. +.PP +Although the game engine is prepared to run under different modes, the game always defaults to 1024x768 resolution, and goes into fullscreen modus to run qonk\. (because of beta status) +.SH "OPTIONS" +.PP +In order to change between levels, the game had to exit and parameters for the game and its level had to be entered from the command line\. A small modification have been introduced for making this automatically\. Nevertheless, you can always start in any level you prefer\. +.PP +Qonk can be given two numeric parameters, the first denoting the number of planets in the solar system, the second gives the number of enemy AI players\. Successive levels of the game are defined by two such parameters\. +.PP +\fB\fInumber of planets\fR\fR +.RS 4 +Total number of planets in the solar system\. +.RE +.PP +\fB\fInumber of AI players\fR\fR +.RS 4 +The number of enemy AI players you will compete with\. +.RE +.SH "HOW TO PLAY" +.PP +You select ships and send them out to planets, to attack or fortify them\. A ship that arrives at an enemy planet dies and kills an enemy ship, residing on that planet, along with it\. If no enemy ships are based on the planet, you take over the planet\. Planets under your control grow new ships for you to send around\. +.PP +You control white planets and white ships\. Colored planets belong to the opponent players\. Gray planets are not controled by a player and can easily be conquered, once its resident neutral ships are destroyed (about 2\-4 of them on each neutral planet)\. +.PP +There are two types of planets in the solar system\. There are planets orbiting around the "sun" and moons orbiting around the planets\. There are as many moons as planets in each solar system\. Some planets may have more moons than others\. A planet is expected to generate twice as many ships as a moon in the same amount of time\. Some planets/moons build ships more quickly than others\. Each ship also has a random speed\. +.PP +Select ships by dragging your left mouse button\. A ship can only be selected for an action if it resides on a planet\. Use the right mouse button to send selected ships to the nearest planet to the mouse pointer\. If you want to select all of the available ships, press A\. +.PP +As you conquer more planets, more ships are built in parallel\. Try to conquer as many planets as possible, so that many new ships are constructed and you can reign over the solar system\. +.PP +There are some extra keys that can be used: +.PP +E +.RS 4 +While pressing E, the ships of enemy players are shown, so this is kind of a cheat button\. +.RE +.PP +P +.RS 4 +Pause and unpause the game\. +.RE +.PP +S +.RS 4 +Save a screenshot (screenshot\.bmp) of the game\. +.RE +.SH "PLAYER RANKING" +.PP +The rank of a player is not only based on the number of planets the player possesses, but also on the number of ships\. A planet gives a player 2 points, a moon gives 0\.999 points, and each ship adds another 1/3 of a point\. A moon is thus worth just under 3 ships\. Players with the highest amount of points rank highest\. +.SH "AUTHOR" +.PP +Qonk was written by Anthony Liekens and Robert Schuster. +.PP +This manual page was written by Martin Ferrari + +for the +Debian(TM) +system, taking text from the game author\'s webpage: http://anthony\.liekens\.net/index\.php/Computers/Qonk +.SH "COPYRIGHT" +.PP +Copyright \(co 2006, Anthony Liekens +.PP +Copyright \(co 2007, Robert Schuster +.PP +This manpage Copyright \(co 2006 Martin Ferrari +.br --- qonk-0.3.1.orig/debian/menu +++ qonk-0.3.1/debian/menu @@ -0,0 +1,2 @@ +?package(qonk):needs="X11" section="Games/Strategy"\ + title="qonk" command="/usr/games/qonk" --- qonk-0.3.1.orig/debian/copyright +++ qonk-0.3.1/debian/copyright @@ -0,0 +1,121 @@ +This package was debianized by Martín Ferrari on +Fri, 16 Jun 2006 12:53:12 -0300. + +It was downloaded from http://anthony.liekens.net/index.php/Computers/Qonk and +later from http://sourceforge.net/projects/qonk/. + +Upstream Authors: + Anthony Liekens + Robert Schuster + +Copyright: + Copyright (C) 2006, Anthony Liekens + Copyright (C) 2007, Robert Schuster + +Includes code from SuperTuxKart: + Copyright (C) 2004, Matthias Braun + +Includes code from the guichan library: + Copyright (C) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson + +Includes a copy of Bistream Vera Mono font, renamed as font.ttf: + Copyright (C) 2003 by Bitstream, Inc. + +License: + + This game is free software released under the GNU General Public License 2 + or, at your option, any later version. See the file COPYING for details. + +License for code from SuperTuxKart: + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + +License for code from the guichan library: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + 3. Neither the name of Guichan nor the names of its contributors may be used + to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +License extracted from font.ttf: + + Copyright (C) 2003 by Bitstream, Inc. All Rights Reserved. + + Bitstream Vera is a trademark of Bitstream, Inc. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of the fonts accompanying this license ("Fonts") and associated + documentation files (the "Font Software"), to reproduce and distribute the + Font Software, including without limitation the rights to use, copy, merge, + publish, distribute, and/or sell copies of the Font Software, and to permit + persons to whom the Font Software is furnished to do so, subject to the + following conditions: + + The above copyright and trademark notices and this permission notice shall + be included in all copies of one or more of the Font Software typefaces. + + The Font Software may be modified, altered, or added to, and in particular + the designs of glyphs or characters in the Fonts may be modified and + additional glyphs or characters may be added to the Fonts, only if the fonts + are renamed to names not containing either the words "Bitstream" or the word + "Vera". + + This License becomes null and void to the extent applicable to Fonts or Font + Software that has been modified and is distributed under the "Bitstream + Vera" names. The Font Software may be sold as part of a larger software + package but no copy of one or more of the Font Software typefaces may be + sold by itself. + + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, + TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME + FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING + ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE + FONT SOFTWARE. + + Except as contained in this notice, the names of Gnome, the Gnome + Foundation, and Bitstream Inc., shall not be used in advertising or + otherwise to promote the sale, use or other dealings in this Font Software + without prior written authorization from the Gnome Foundation or Bitstream + Inc., respectively. For further information, contact: fonts at gnome dot + org.http://www.bitstream.com + +A copy of the GNU General Public License is in /usr/share/common-licenses/GPL. + +The Debian packaging is Copyright (C) 2006, 2007, Martín Ferrari + and is licensed under the GPL, see above. + --- qonk-0.3.1.orig/debian/compat +++ qonk-0.3.1/debian/compat @@ -0,0 +1 @@ +5 --- qonk-0.3.1.orig/debian/control +++ qonk-0.3.1/debian/control @@ -0,0 +1,21 @@ +Source: qonk +Section: games +Priority: optional +Maintainer: Debian Games Team +Uploaders: Martín Ferrari , Barry deFreese +Build-Depends: cdbs, debhelper (>= 5), quilt, autoconf, automake1.11, libtool, libsdl1.2-dev, libsdl-ttf2.0-dev, + libsdl-gfx1.2-dev, libsdl-image1.2-dev +Standards-Version: 3.8.3 +Homepage: http://sourceforge.net/projects/qonk/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/qonk/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/qonk/?op=log + +Package: qonk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu +Description: Small build-and-conquer strategy game with very simple rules + The setting of the game is a solar system of planets. Your goal is to + conquer all of the planets in the game by sending ships there. Planets + that are under your control generate new ships. Simple AI players are + playing against you. As you gain more experience throughout the game, + more AI players have to be kicked out of bigger solar systems. --- qonk-0.3.1.orig/debian/qonk.desktop +++ qonk-0.3.1/debian/qonk.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qonk +GenericName=qonk +Comment=Conquer the planets +Type=Application +Exec=qonk +Icon=qonk +Terminal=false +Categories=Game;StrategyGame; + --- qonk-0.3.1.orig/debian/changelog +++ qonk-0.3.1/debian/changelog @@ -0,0 +1,78 @@ +qonk (0.3.1-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Team intern so not strictly following the procedures + * Fix build failure (Closes: #541443) + * Set DEB_AUTO_UPDATE_AUTOMAKE to 1.11 and specify automake dependency + to 1.11 so build success does not depend on any specific version being + `automake' + * Add DEB_AUTO_UPDATE_ACLOCAL to build with automake 1.11 + * Bump standards Version to 3.8.3 + * Add README.source copied and adapted from supertuxkart + + -- Christoph Egger Wed, 30 Sep 2009 12:30:37 +0200 + +qonk (0.3.1-3) unstable; urgency=low + + [ Barry deFreese ] + * 50_absolute_mouse.diff - Use absolute mouse positioning. (Closes: #480170). + + Thanks to Christian Pulvermacher for the patch!. + + -- Barry deFreese Fri, 10 Apr 2009 13:03:25 -0400 + +qonk (0.3.1-2) unstable; urgency=low + + [ Eddy Petrișor ] + * fix Vcs-Svn URL to point to svn, not the incomplete ssh location + + [ Martín Ferrari ] + * Updated email address. + + [ Barry deFreese ] + * 30_gcc_4.4.diff - Build with gcc-4.4. (Closes: #504898). + + Thanks to Martin Michlmayr for the fix. + * 40_player_colors.diff - Fix message colors. (Closes: #447215). + + Thanks to Christian Pulvermacher for the hint! + * Update my e-mail address. + * Fix up some debian/copyright syntax. + * Bump Standards Version to 3.8.1. + + -- Barry deFreese Tue, 07 Apr 2009 22:05:58 -0400 + +qonk (0.3.1-1) unstable; urgency=low + + [ Barry deFreese ] + * New upstream release. + * Move from simple-patch-sys to quilt. + * Remove 00-invalid_operator.patch, no longer necessary. + * 10_build_environment.diff - Fix upstream build issues. + + Thanks to Ben Asselstine for the fix. + * Autoreconf on build to pick up fixes from patch. + * Add build-deps for autoconf, automake, and libtool. + * Add myself to uploaders. + * Add VCS fields in control. + * Add desktop file. + * 20_gcc_4.3.diff - Build with gcc-4.3. (Closes: #462052). + * Use ttf-dejavu instead of bitstream-vera. (Closes: #455583, #461288). + * Bump Standards Version to 3.7.3. (No changes needed). + + -- Barry deFreese Sun, 18 Nov 2007 22:59:58 -0500 + +qonk (0.3.0-2) unstable; urgency=low + + * A typo in upstream code prevented from locating the font.ttf file. + (Closes: #446715) + + -- Martín Ferrari Tue, 16 Oct 2007 02:50:22 -0300 + +qonk (0.3.0-1) unstable; urgency=low + + * Initial release (Closes: #373966) after a year of waiting for upstream to + resolve licensing issues. + * Ignored provided font.ttf, as it is a copy of VeraMono.ttf from + ttf-bitstream-vera. Instead, I put a symlink and a dependency. + * Added license notice for the font, although we don't ship it in the + binary. + + -- Martín Ferrari Mon, 08 Oct 2007 17:41:01 -0300 + --- qonk-0.3.1.orig/debian/patches/40_player_colors.diff +++ qonk-0.3.1/debian/patches/40_player_colors.diff @@ -0,0 +1,27 @@ +#Description: Fix mixed up color code. +Index: qonk-0.3.1/src/messages.cpp +=================================================================== +--- qonk-0.3.1.orig/src/messages.cpp 2009-04-07 22:00:04.000000000 -0400 ++++ qonk-0.3.1/src/messages.cpp 2009-04-07 22:01:23.000000000 -0400 +@@ -21,8 +21,8 @@ + Message::Message( Uint32 time, string message, Uint32 displayTime, Uint32 color ) { + this->message = string( "[" ) + Timer::getTimeMMSS(time) + "] " + message; + this->displayTime = displayTime; +- this->r = getGreen( color ); +- this->g = getRed( color ); ++ this->r = getRed( color ); ++ this->g = getGreen( color ); + this->b = getBlue( color ); + } + +@@ -37,8 +37,8 @@ + Message::Message( Uint32 time, string message, Uint32 color ) { + this->message = string( "[" ) + Timer::getTimeMMSS(time) + "] " + message; + this->displayTime = 10000; +- this->r = getGreen( color ); +- this->g = getRed( color ); ++ this->r = getRed( color ); ++ this->g = getGreen( color ); + this->b = getBlue( color ); + } + --- qonk-0.3.1.orig/debian/patches/10_build_environment.diff +++ qonk-0.3.1/debian/patches/10_build_environment.diff @@ -0,0 +1,180 @@ +#Description: Fix includes. +diff -uNrd qonk-0.3.1.orig/Makefile.am qonk-0.3.1/Makefile.am +--- qonk-0.3.1.orig/Makefile.am 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/Makefile.am 2007-11-18 20:47:03.000000000 -0500 +@@ -1,4 +1,5 @@ + SUBDIRS = guichan src data ++AUTOMAKE_OPTIONS=foreign + + EXTRA_DIST = autogen.sh README COPYING missing TODO HISTORY THANKYOU + +diff -uNrd qonk-0.3.1.orig/src/canvas.h qonk-0.3.1/src/canvas.h +--- qonk-0.3.1.orig/src/canvas.h 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/canvas.h 2007-11-18 20:55:30.000000000 -0500 +@@ -10,7 +10,7 @@ + + #include + +-#include "guichan/guichan/sdl.hpp" ++#include "guichan/sdl.hpp" + + class Coordinate; + class Font; +diff -uNrd qonk-0.3.1.orig/src/controloptions.cpp qonk-0.3.1/src/controloptions.cpp +--- qonk-0.3.1.orig/src/controloptions.cpp 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/controloptions.cpp 2007-11-18 20:57:10.000000000 -0500 +@@ -1,7 +1,7 @@ + #include + #include + +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + #include "ui/menuaction.h" + +diff -uNrd qonk-0.3.1.orig/src/gameoptions.cpp qonk-0.3.1/src/gameoptions.cpp +--- qonk-0.3.1.orig/src/gameoptions.cpp 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/gameoptions.cpp 2007-11-18 20:56:00.000000000 -0500 +@@ -3,7 +3,7 @@ + + #include + +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + #include "ui/menuaction.h" + +diff -uNrd qonk-0.3.1.orig/src/Makefile.am qonk-0.3.1/src/Makefile.am +--- qonk-0.3.1.orig/src/Makefile.am 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/Makefile.am 2007-11-18 20:50:33.000000000 -0500 +@@ -1,5 +1,4 @@ + SUBDIRS = lisp ui +- + INCLUDES = -I$(top_srcdir)/guichan + + AM_CPPFLAGS=-DPKG_DATA_DIR="\"$(pkgdatadir)/\"" +diff -uNrd qonk-0.3.1.orig/src/menumanager.h qonk-0.3.1/src/menumanager.h +--- qonk-0.3.1.orig/src/menumanager.h 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/menumanager.h 2007-11-18 20:50:40.000000000 -0500 +@@ -14,6 +14,7 @@ + class GameOptions; + + class MenuSystem; ++#include "ui/menuaction.h" + + /** + * MenuManager forms the facade for interacting with the game's menus. +@@ -66,7 +67,7 @@ + VideoOptions &getVideoOptions() const { return *videoOptions; }; + }; + +-class QuitAction : public MenuAction ++class QuitAction : public MenuAction + { + Main &main; + +diff -uNrd qonk-0.3.1.orig/src/sdl_driver.h qonk-0.3.1/src/sdl_driver.h +--- qonk-0.3.1.orig/src/sdl_driver.h 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/sdl_driver.h 2007-11-18 20:55:42.000000000 -0500 +@@ -9,8 +9,8 @@ + + #include + +-#include "guichan/guichan.hpp" +-#include "guichan/guichan/sdl.hpp" ++#include "guichan.hpp" ++#include "guichan/sdl.hpp" + + #include "input.h" + +diff -uNrd qonk-0.3.1.orig/src/ui/Makefile.am qonk-0.3.1/src/ui/Makefile.am +--- qonk-0.3.1.orig/src/ui/Makefile.am 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/ui/Makefile.am 2007-11-18 20:39:42.000000000 -0500 +@@ -1,6 +1,6 @@ + AM_CPPFLAGS=-DPKG_DATA_DIR="\"$(pkgdatadir)/\"" + +-INCLUDES = -I$(top_srcdir)/guichan ++INCLUDES = -I$(top_srcdir)/guichan -I$(top_srcdir)/src + + noinst_LIBRARIES = libui.a + +diff -uNrd qonk-0.3.1.orig/src/ui/menuaction.cpp qonk-0.3.1/src/ui/menuaction.cpp +--- qonk-0.3.1.orig/src/ui/menuaction.cpp 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/ui/menuaction.cpp 2007-11-18 20:52:51.000000000 -0500 +@@ -1,4 +1,4 @@ +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + #include "menuaction.h" + +diff -uNrd qonk-0.3.1.orig/src/ui/menuaction.h qonk-0.3.1/src/ui/menuaction.h +--- qonk-0.3.1.orig/src/ui/menuaction.h 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/ui/menuaction.h 2007-11-18 20:53:41.000000000 -0500 +@@ -7,7 +7,7 @@ + #ifndef MENUACTION_H + #define MENUACTION_H + +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + /* TODO: Realize all customized behavior with specific MenuEntry subclasses + * and remove the need for a MenuAction delegate object. +diff -uNrd qonk-0.3.1.orig/src/ui/menuentry.cpp qonk-0.3.1/src/ui/menuentry.cpp +--- qonk-0.3.1.orig/src/ui/menuentry.cpp 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/ui/menuentry.cpp 2007-11-18 20:54:01.000000000 -0500 +@@ -1,4 +1,4 @@ +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + #include "menuentry.h" + #include "menusystem.h" +diff -uNrd qonk-0.3.1.orig/src/ui/menuentry.h qonk-0.3.1/src/ui/menuentry.h +--- qonk-0.3.1.orig/src/ui/menuentry.h 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/ui/menuentry.h 2007-11-18 20:53:55.000000000 -0500 +@@ -7,7 +7,7 @@ + #ifndef MENUENTRY_H + #define MENUENTRY_H + +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + class MenuSystem; + +diff -uNrd qonk-0.3.1.orig/src/ui/menu.h qonk-0.3.1/src/ui/menu.h +--- qonk-0.3.1.orig/src/ui/menu.h 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/ui/menu.h 2007-11-18 20:54:08.000000000 -0500 +@@ -9,7 +9,7 @@ + + #include + +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + class MenuSystem; + class MenuEntry; +diff -uNrd qonk-0.3.1.orig/src/ui/menusystem.h qonk-0.3.1/src/ui/menusystem.h +--- qonk-0.3.1.orig/src/ui/menusystem.h 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/ui/menusystem.h 2007-11-18 20:54:20.000000000 -0500 +@@ -9,8 +9,8 @@ + + #include + +-#include "guichan/guichan.hpp" +-#include "guichan/guichan/sdl.hpp" ++#include "guichan.hpp" ++#include "guichan/sdl.hpp" + + #include "menu.h" + +diff -uNrd qonk-0.3.1.orig/src/videooptions.cpp qonk-0.3.1/src/videooptions.cpp +--- qonk-0.3.1.orig/src/videooptions.cpp 2007-09-14 01:43:03.000000000 -0400 ++++ qonk-0.3.1/src/videooptions.cpp 2007-11-18 20:55:52.000000000 -0500 +@@ -3,7 +3,7 @@ + + #include + +-#include "guichan/guichan.hpp" ++#include "guichan.hpp" + + #include "ui/menuaction.h" + --- qonk-0.3.1.orig/debian/patches/50_absolute_mouse.diff +++ qonk-0.3.1/debian/patches/50_absolute_mouse.diff @@ -0,0 +1,141 @@ +#Description: Use absolute mouse position. +Index: qonk-0.3.1/src/game.cpp +=================================================================== +--- qonk-0.3.1.orig/src/game.cpp 2009-04-10 13:00:28.000000000 -0400 ++++ qonk-0.3.1/src/game.cpp 2009-04-10 13:02:20.000000000 -0400 +@@ -178,6 +178,14 @@ + if (value) + setFleetStrength(1); + break; ++ case GA_MOVE_CURSOR_H: ++ if(value) ++ x = value; ++ break; ++ case GA_MOVE_CURSOR_V: ++ if(value) ++ y = value; ++ break; + case GA_CURSOR_UP: + yn = value; + break; +Index: qonk-0.3.1/src/input.h +=================================================================== +--- qonk-0.3.1.orig/src/input.h 2009-04-10 13:01:05.000000000 -0400 ++++ qonk-0.3.1/src/input.h 2009-04-10 13:02:20.000000000 -0400 +@@ -53,6 +53,9 @@ + + GA_SELECTION, + ++ GA_MOVE_CURSOR_H, ++ GA_MOVE_CURSOR_V, ++ + GA_CURSOR_UP, + GA_CURSOR_DOWN, + GA_CURSOR_LEFT, +Index: qonk-0.3.1/src/sdl_driver.cpp +=================================================================== +--- qonk-0.3.1.orig/src/sdl_driver.cpp 2009-04-10 13:01:22.000000000 -0400 ++++ qonk-0.3.1/src/sdl_driver.cpp 2009-04-10 13:02:20.000000000 -0400 +@@ -217,23 +217,23 @@ + + if (ev.motion.xrel <= -DEADZONE_MOUSE) + { +- input(IT_MOUSEMOTION, 0, AD_NEGATIVE, 0, -ev.motion.xrel); ++ input(IT_MOUSEMOTION, 0, 0, 0, ev.motion.x); + mouseXNeg = MOVED; + } + else if(ev.motion.xrel >= DEADZONE_MOUSE) + { +- input(IT_MOUSEMOTION, 0, AD_POSITIVE, 0, ev.motion.xrel); ++ input(IT_MOUSEMOTION, 0, 0, 0, ev.motion.x); + mouseXPos = MOVED; + } + + if (ev.motion.yrel <= -DEADZONE_MOUSE) + { +- input(IT_MOUSEMOTION, 1, AD_NEGATIVE, 0, -ev.motion.yrel); ++ input(IT_MOUSEMOTION, 1, 0, 0, ev.motion.y); + mouseYNeg = MOVED; + } + else if(ev.motion.yrel >= DEADZONE_MOUSE) + { +- input(IT_MOUSEMOTION, 1, AD_POSITIVE, 0, ev.motion.yrel); ++ input(IT_MOUSEMOTION, 1, 0, 0, ev.motion.y); + mouseYPos = MOVED; + } + +@@ -263,7 +263,7 @@ + // like a key or joystick axis where releases and non-movement can be detected. + if (mouseXNeg == RESET_NEEDED) + { +- input(IT_MOUSEMOTION, 0, AD_NEGATIVE, 0, 0); ++ input(IT_MOUSEMOTION, 0, 0, 0, 0); + mouseXNeg = INITIAL; + } + else if (mouseXNeg == MOVED) +@@ -271,7 +271,7 @@ + + if (mouseXPos == RESET_NEEDED) + { +- input(IT_MOUSEMOTION, 0, AD_POSITIVE, 0, 0); ++ input(IT_MOUSEMOTION, 0, 0, 0, 0); + mouseXPos = INITIAL; + } + else if (mouseXPos == MOVED) +@@ -279,7 +279,7 @@ + + if (mouseYNeg == RESET_NEEDED) + { +- input(IT_MOUSEMOTION, 1, AD_NEGATIVE, 0, 0); ++ input(IT_MOUSEMOTION, 1, 0, 0, 0); + mouseYNeg = INITIAL; + } + else if (mouseYNeg == MOVED) +@@ -287,7 +287,7 @@ + + if (mouseYPos == RESET_NEEDED) + { +- input(IT_MOUSEMOTION, 1, AD_POSITIVE, 0, 0); ++ input(IT_MOUSEMOTION, 1, 0, 0, 0); + mouseYPos = INITIAL; + } + else if (mouseYPos == MOVED) +Index: qonk-0.3.1/src/settings.cpp +=================================================================== +--- qonk-0.3.1.orig/src/settings.cpp 2009-04-10 13:01:42.000000000 -0400 ++++ qonk-0.3.1/src/settings.cpp 2009-04-10 13:02:20.000000000 -0400 +@@ -66,6 +66,8 @@ + // Those are fixed and not supposed to be changed via a config file. + set(GA_TOGGLE_GRAB, IT_KEYBOARD, SDLK_g, 0, 0); + set(GA_LEAVE, IT_KEYBOARD, SDLK_ESCAPE, 0, 0); ++ set(GA_MOVE_CURSOR_H, IT_MOUSEMOTION, 0, 0 , 0); ++ set(GA_MOVE_CURSOR_V, IT_MOUSEMOTION, 1, 0 , 0); + + const lisp::Lisp* root = 0; + +@@ -308,6 +310,8 @@ + subReader->get("axis", id0); + subReader->get("direction", id1); + id2 = 0; ++ if(id0 == 0 || id0 == 1) ++ id0 = -1; //ignore old bindings for mouse movement + } + else if (inputTypeName == "mousebutton") + { +@@ -489,16 +493,12 @@ + set(GA_MOVE_TO_NEAREST_PLANET, IT_MOUSEBUTTON, SDL_BUTTON_RIGHT, 0, 0); + set(GA_MOVE_TO_NEAREST_PLANET, IT_KEYBOARD, SDLK_LCTRL, 0, 0); + +- set(GA_CURSOR_LEFT, IT_MOUSEMOTION, 0, AD_NEGATIVE, 0); + set(GA_CURSOR_LEFT, IT_KEYBOARD, SDLK_LEFT, 0, 0); + +- set(GA_CURSOR_RIGHT, IT_MOUSEMOTION, 0, AD_POSITIVE, 0); + set(GA_CURSOR_RIGHT, IT_KEYBOARD, SDLK_RIGHT, 0, 0); + +- set(GA_CURSOR_UP, IT_MOUSEMOTION, 1, AD_NEGATIVE, 0); + set(GA_CURSOR_UP, IT_KEYBOARD, SDLK_UP, 0, 0); + +- set(GA_CURSOR_DOWN, IT_MOUSEMOTION, 1, AD_POSITIVE, 0); + set(GA_CURSOR_DOWN, IT_KEYBOARD, SDLK_DOWN, 0, 0); + + /* preliminary: cursor control with joystick - works good --- qonk-0.3.1.orig/debian/patches/series +++ qonk-0.3.1/debian/patches/series @@ -0,0 +1,5 @@ +10_build_environment.diff +20_gcc_4.3.diff +30_gcc_4.4.diff +40_player_colors.diff +50_absolute_mouse.diff --- qonk-0.3.1.orig/debian/patches/30_gcc_4.4.diff +++ qonk-0.3.1/debian/patches/30_gcc_4.4.diff @@ -0,0 +1,27 @@ +#Add proper includes to build with gcc-4.4. + +Index: qonk-0.3.1/src/lisp/lexer.cpp +=================================================================== +--- qonk-0.3.1.orig/src/lisp/lexer.cpp 2009-03-16 15:56:34.000000000 -0400 ++++ qonk-0.3.1/src/lisp/lexer.cpp 2009-03-16 15:56:52.000000000 -0400 +@@ -19,6 +19,7 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include + #include ++#include + #include + + #include "lexer.hpp" +Index: qonk-0.3.1/src/lisp/lisp.cpp +=================================================================== +--- qonk-0.3.1.orig/src/lisp/lisp.cpp 2009-03-16 15:57:07.000000000 -0400 ++++ qonk-0.3.1/src/lisp/lisp.cpp 2009-03-16 15:57:24.000000000 -0400 +@@ -19,6 +19,8 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "lisp.hpp" + ++#include ++ + namespace lisp + { + --- qonk-0.3.1.orig/debian/patches/20_gcc_4.3.diff +++ qonk-0.3.1/debian/patches/20_gcc_4.3.diff @@ -0,0 +1,44 @@ +#Desription: Build with gcc-4.3. +diff -urN qonk-0.3.1.orig/src/lisp/lexer.cpp qonk-0.3.1/src/lisp/lexer.cpp +--- qonk-0.3.1.orig/src/lisp/lexer.cpp 2008-02-05 13:57:23.000000000 -0500 ++++ qonk-0.3.1/src/lisp/lexer.cpp 2008-02-05 13:57:59.000000000 -0500 +@@ -19,6 +19,7 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include + #include ++#include + + #include "lexer.hpp" + #include "translation.hpp" +diff -urN qonk-0.3.1.orig/src/lisp/parser.cpp qonk-0.3.1/src/lisp/parser.cpp +--- qonk-0.3.1.orig/src/lisp/parser.cpp 2008-02-05 13:57:23.000000000 -0500 ++++ qonk-0.3.1/src/lisp/parser.cpp 2008-02-05 13:58:26.000000000 -0500 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include + +diff -urN qonk-0.3.1.orig/src/sdl_driver.cpp qonk-0.3.1/src/sdl_driver.cpp +--- qonk-0.3.1.orig/src/sdl_driver.cpp 2008-02-05 13:57:23.000000000 -0500 ++++ qonk-0.3.1/src/sdl_driver.cpp 2008-02-05 13:58:54.000000000 -0500 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include "sdl_driver.h" + #include "canvas.h" +diff -urN qonk-0.3.1.orig/src/videooptions.cpp qonk-0.3.1/src/videooptions.cpp +--- qonk-0.3.1.orig/src/videooptions.cpp 2008-02-05 13:57:23.000000000 -0500 ++++ qonk-0.3.1/src/videooptions.cpp 2008-02-05 13:59:26.000000000 -0500 +@@ -1,5 +1,6 @@ + #include + #include ++#include + + #include +