Author: baby-guest Date: 2008-01-18 19:20:00 +0000 (Fri, 18 Jan 2008) New Revision: 5464
Added: packages/trunk/droidbattles/debian/ packages/trunk/droidbattles/debian/changelog packages/trunk/droidbattles/debian/compat packages/trunk/droidbattles/debian/control packages/trunk/droidbattles/debian/copyright packages/trunk/droidbattles/debian/dirs packages/trunk/droidbattles/debian/docs packages/trunk/droidbattles/debian/droidbattles.1 packages/trunk/droidbattles/debian/droidbattles.xpm packages/trunk/droidbattles/debian/examples packages/trunk/droidbattles/debian/menu packages/trunk/droidbattles/debian/patches/ packages/trunk/droidbattles/debian/patches/fixes.patch packages/trunk/droidbattles/debian/patches/series packages/trunk/droidbattles/debian/rules Log: [svn-inject] Applying Debian modifications to trunk Property changes on: packages/trunk/droidbattles/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Added: packages/trunk/droidbattles/debian/changelog =================================================================== --- packages/trunk/droidbattles/debian/changelog (rev 0) +++ packages/trunk/droidbattles/debian/changelog 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,48 @@ +droidbattles (1.0.6-6) UNRELEASED; urgency=low + + [ Miriam Ruiz ] + * New Maintainer: Debian Games Team. Closes: 461449 + * Removed bashisms and tidied up debian/rules. Closes: #453153 + * Added Homepage label to debian/control + * Added autotools-dev to build dependencies + * Removed empty directory usr/bin from binary packages + * Fixed FSF address and GPL links in debian/copyright + * Bumped standards version from 3.6.2 up to 3.7.3 + * Using quilt for managing patches + + -- Miriam Ruiz <[EMAIL PROTECTED]> Fri, 18 Jan 2008 17:52:24 +0000 + +droidbattles (1.0.6-4) unstable; urgency=low + + * Removed build-dep automake1.6 (Closes: #335119) + + -- Kari Pahula <[EMAIL PROTECTED]> Mon, 24 Oct 2005 00:20:52 +0300 + +droidbattles (1.0.6-3.1) unstable; urgency=low + + * NMU for QT transition (Closes: #327954) + + -- Don Armstrong <[EMAIL PROTECTED]> Mon, 26 Sep 2005 23:18:02 -0700 + +droidbattles (1.0.6-3) unstable; urgency=low + + * Sponsored upload by Jens Peter Secher. + * Made the description more descriptive. + + -- Kari Pahula <[EMAIL PROTECTED]> Sat, 28 May 2005 22:19:51 +0200 + +droidbattles (1.0.6-2) unstable; urgency=low + + * Added missing build-depends: libqt3-mt-dev, libqt3-compat-headers + + -- Kari Pahula <[EMAIL PROTECTED]> Wed, 25 May 2005 05:34:49 +0300 + +droidbattles (1.0.6-1) unstable; urgency=low + + * Fixed idiosyncrasies in the C++ code, now compiles with current + versions of g++ too. + * Made files to install to the standard places. + * Removed /etc/droidbattles.conf from use. + * Initial Release. (Closes: #306852) + + -- Kari Pahula <[EMAIL PROTECTED]> Thu, 5 May 2005 23:32:28 +0300 Added: packages/trunk/droidbattles/debian/compat =================================================================== --- packages/trunk/droidbattles/debian/compat (rev 0) +++ packages/trunk/droidbattles/debian/compat 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1 @@ +4 Added: packages/trunk/droidbattles/debian/control =================================================================== --- packages/trunk/droidbattles/debian/control (rev 0) +++ packages/trunk/droidbattles/debian/control 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,19 @@ +Source: droidbattles +Section: games +Priority: optional +Maintainer: Debian Games Team <[EMAIL PROTECTED]> +Uploaders: Miriam Ruiz <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 4.0.0), quilt, autotools-dev, libqt3-mt-dev, libqt3-compat-headers +Standards-Version: 3.7.3 +Homepage: http://www.bluefire.nu/droidbattles/ + +Package: droidbattles +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: A game of programming battle droids + You design and program droids in an assembler-like language to make + them as lethal as possible to other droids. You then run the droid + in a battle simulation where they try to destroy each other. + . + Hardware design, programming and battle simulation all happens in an + integrated graphical development environment. Added: packages/trunk/droidbattles/debian/copyright =================================================================== --- packages/trunk/droidbattles/debian/copyright (rev 0) +++ packages/trunk/droidbattles/debian/copyright 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,29 @@ +This package was debianized by Kari Pahula <[EMAIL PROTECTED]> on +Fri, 29 Apr 2005 01:04:53 +0300. + +It was downloaded from http://www.bluefire.nu/droidbattles/download.html + +Copyright Holder: Andreas Agorander + +License: + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +On Debian systems, the complete text of the latest version of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. Added: packages/trunk/droidbattles/debian/dirs =================================================================== --- packages/trunk/droidbattles/debian/dirs (rev 0) +++ packages/trunk/droidbattles/debian/dirs 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,4 @@ +usr/bin +usr/games +usr/share/doc/droidbattles/html +usr/share/games Added: packages/trunk/droidbattles/debian/docs =================================================================== --- packages/trunk/droidbattles/debian/docs (rev 0) +++ packages/trunk/droidbattles/debian/docs 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,2 @@ +README +TODO Added: packages/trunk/droidbattles/debian/droidbattles.1 =================================================================== --- packages/trunk/droidbattles/debian/droidbattles.1 (rev 0) +++ packages/trunk/droidbattles/debian/droidbattles.1 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,121 @@ +.\" 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 DROIDBATTLES 6 "May 5, 2005" +.\" 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 <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +droidbattles \- a programming game +.SH SYNOPSIS +.B droidbattles +.br +.B droidbattles -textmode +.RB [ -assemble +.IR botm ] +.RB [ -check +.IR configfile ] +.RB [ -loadconfig +.IR configfile ] +.RB [ -battle ] +.RB [ -normal ] +.RB [ -survival ] +.RB [ -deathmatch ] +.RB [ -team +.IR num ] +.RB [ -xsize +.IR size ] +.RB [ -ysize +.IR size ] +.RB [ -numfights +.IR num ] +.RB [ -maxrounds +.IR max ] +.RB [ -bot +.IR botn ] +... +.SH DESCRIPTION +.B droidbattles +is a programming game. You design and program bots (in an +asm-like language) in order to make it better then anyone elses +bot. You then run the bots in a battle simulation, where they try to +kill each other. +.SH OPTIONS +.B droidbattles +is usually ran without any options. +.TP +.B -textmode +Don't run the GUI. None of the other options have any effect if this isn't given. +.TP +.BI -assemble \ botm +Assemble the bot source file +.B botm +into a bot file. +.TP +.BI -check \ configfile +Checks the integrity of a configuration file. +.TP +.BI -loadconfig \ configfile +Use a different configuration for the battle. +.TP +.B -battle +Run a battle. +.TP +.B -normal +Set the battle mode to normal. This is the default. +.TP +.B -survival +Set the battle mode to survival. +.TP +.B -deathmatch +Set the battle mode to deathmatch. +.TP +.BI -team \ num +Make the following bots to belong to team +.BR num . +Must be a number between 1 and 4. +.TP +.BI -xsize \ size +.TP +.BI -ysize \ size +Defines the size of the arena. +.I size +must be larger than 8192 and smaller than 65535. If omitted, the +default size of 32768 is used. +.TP +.BI -numfights \ num +Fight +.I num +fights. +.TP +.BI -maxrounds \ max +Allow a fight to last at most +.I max +rounds. If omitted, the default value of 6000 is used. +.TP +.BI -bot \ botn +Use bot +.I botn +in the fight(s). + +.SH SEE ALSO + +More documentation can be found in +.B /usr/share/doc/droidbattles/html/ +in html format. + +.SH AUTHOR +droidbattles was written by Andreas Agorander <[EMAIL PROTECTED]>. +.PP +This manual page was written by Kari Pahula <[EMAIL PROTECTED]>, +for the Debian project (but may be used by others). Added: packages/trunk/droidbattles/debian/droidbattles.xpm =================================================================== --- packages/trunk/droidbattles/debian/droidbattles.xpm (rev 0) +++ packages/trunk/droidbattles/debian/droidbattles.xpm 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,116 @@ +/* XPM */ +static char * droidbattles_xpm[] = { +"26 22 91 1", +" c None", +". c #1C1E1C", +"+ c #20211F", +"@ c #232522", +"# c #282927", +"$ c #2B2D2A", +"% c #313330", +"& c #1B4912", +"* c #174C0D", +"= c #373836", +"- c #3A3C39", +"; c #185616", +"> c #3E3F3D", +", c #2D4F26", +"' c #414341", +") c #1D6119", +"! c #216313", +"~ c #484947", +"{ c #4B4D4A", +"] c #456148", +"^ c #575956", +"/ c #5D5F5C", +"( c #636562", +"_ c #676866", +": c #686A67", +"< c #3E893D", +"[ c #429036", +"} c #6E706D", +"| c #747572", +"1 c #767875", +"2 c #7C7D7B", +"3 c #54A246", +"4 c #3FB32B", +"5 c #818380", +"6 c #828481", +"7 c #3EBA28", +"8 c #858784", +"9 c #8B8D8A", +"0 c #41C629", +"a c #8F918E", +"b c #929491", +"c c #979996", +"d c #9B9D9A", +"e c #81B37A", +"f c #9EA09D", +"g c #A0A29F", +"h c #8AB287", +"i c #A4A6A3", +"j c #A7A9A6", +"k c #AAACA9", +"l c #88CB7B", +"m c #AFB1AE", +"n c #9EBDA1", +"o c #8DCD8A", +"p c #B2B4B1", +"q c #A6BDA2", +"r c #ADB7B2", +"s c #94CC8A", +"t c #B1B7AD", +"u c #9FC39F", +"v c #92CD92", +"w c #B4B6B3", +"x c #7FDD73", +"y c #8DD388", +"z c #57FC41", +"A c #6CED5A", +"B c #63F54F", +"C c #7AE56B", +"D c #B7B9B6", +"E c #B9BBB8", +"F c #89E07E", +"G c #82E674", +"H c #BBBDBA", +"I c #9DD593", +"J c #79F267", +"K c #BDC0BC", +"L c #AFCBA8", +"M c #76F662", +"N c #C0C2BF", +"O c #8DEA80", +"P c #A6DF9C", +"Q c #C7C9C6", +"R c #C8CFC4", +"S c #CCCECA", +"T c #C8D1CC", +"U c #A9EAA5", +"V c #C9DCC8", +"W c #D4D7D3", +"X c #C8E0C4", +"Y c #D8DAD7", +"Z c #DCDEDB", +" @^ ", +" ;7qp= @. )! ", +" 3smij9 (--2mbh4& ", +" #mb62NE|g:2rvEKSpp ", +" |pa6cKNNErFSzVYQp ", +" aEESQg8QSQJUOFk ", +" =wSwd228EWYPJqsk ", +" bg9828fDNQSHum_ ", +"=pf2akKEDwDw2_a( @ {a~<z*", +" wmmNDwppma bfar2kDpj] ", +" ~2mppqfbb /kqvCQYSpk ", +" |=7ebcapELBRzRKb~ ", +" )ykppNSYMPGI2 ", +" (kmmpENQYPyr9> ", +" bpDHKjfYSw1 ", +" 'DKDf882EQD> ", +" gkb226dHQk. ", +" =jf28fSSjND+ ", +" =mkfKHg28ii@ ", +" #2bHEi6dDk ", +" >cEmILf+ ", +" =[4, "}; Added: packages/trunk/droidbattles/debian/examples =================================================================== --- packages/trunk/droidbattles/debian/examples (rev 0) +++ packages/trunk/droidbattles/debian/examples 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1 @@ +droidbattles/*.basm Added: packages/trunk/droidbattles/debian/menu =================================================================== --- packages/trunk/droidbattles/debian/menu (rev 0) +++ packages/trunk/droidbattles/debian/menu 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,3 @@ +?package(droidbattles):needs="X11" section="Games/Simulation"\ + title="droidbattles" command="/usr/games/droidbattles" \ + icon="/usr/share/pixmaps/droidbattles.xpm" Added: packages/trunk/droidbattles/debian/patches/fixes.patch =================================================================== --- packages/trunk/droidbattles/debian/patches/fixes.patch (rev 0) +++ packages/trunk/droidbattles/debian/patches/fixes.patch 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,1083 @@ +--- droidbattles-1.0.6.orig/droidbattles/createbot.cpp ++++ droidbattles-1.0.6/droidbattles/createbot.cpp +@@ -2534,7 +2534,7 @@ + * Shows a message from the assembler and an OK button. + * It also sets the current editing line to line + */ +-void createbot::error( char *msg,int line ) ++void createbot::error( const char *msg,int line ) + { + QMessageBox::information( 0,"Message from the almighty assembler", msg ); + if( line >= 0 ) edittxt->setCursorPosition( line,0 ); +--- droidbattles-1.0.6.orig/droidbattles/screenobject.cpp ++++ droidbattles-1.0.6/droidbattles/screenobject.cpp +@@ -29,7 +29,7 @@ + { + } + +-void screenobject::showobject( QWidget *buffer, int opt = 0 ) ++void screenobject::showobject( QWidget *buffer, int opt ) + { + } + +@@ -113,8 +113,8 @@ + return 0; + } + +-void screenobject::addscrobject( int X,int Y,int dir,int type, int arg1=0, +- int arg2=0,void *arg3=0 ) ++void screenobject::addscrobject( int X,int Y,int dir,int type, int arg1, ++ int arg2,void *arg3 ) + { + } + +@@ -264,4 +264,4 @@ + + void screenobject::dumpRAM( ) + { +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/robots.h ++++ droidbattles-1.0.6/droidbattles/robots.h +@@ -38,7 +38,6 @@ + #include "fuel.h" + #include "turret.h" + #include <qbitmap.h> +-#include <math.h> + #include <stdlib.h> + #include <qmessagebox.h> + #include "timedev.h" +@@ -100,7 +99,7 @@ + const char* getdebug2( ); + void setdebug1( int ); + void setdebug2( int ); +- void error( char *,char * ); ++ void error( const char *,const char * ); + int getmem( ); + void addinterrupt( int ); + struct debugcontents returndbgcont( ); +--- droidbattles-1.0.6.orig/droidbattles/pixbutton.cpp ++++ droidbattles-1.0.6/droidbattles/pixbutton.cpp +@@ -17,7 +17,7 @@ + + #include "pixbutton.h" + +-PixButton::PixButton( char *text,int pix,QWidget *parent,char *name=0 ) ++PixButton::PixButton( const char *text,int pix,QWidget *parent,char *name ) + : QPushButton( parent,name ) + { + whichpix = pix; +--- droidbattles-1.0.6.orig/droidbattles/textmodefilemanip.h ++++ droidbattles-1.0.6/droidbattles/textmodefilemanip.h +@@ -24,10 +24,10 @@ + #include <qdir.h> + #include <qtextstream.h> + #include <qdatastream.h> +-#include <iostream.h> ++#include <iostream> + #include <qfile.h> + #include <qregexp.h> +-#include <string.h> ++#include <string> + /** + [EMAIL PROTECTED] Andreas Agorander + */ +--- droidbattles-1.0.6.orig/droidbattles/instruktion.h ++++ droidbattles-1.0.6/droidbattles/instruktion.h +@@ -31,7 +31,7 @@ + + public: + +- instruktion( char mnem[],int arg1t,int arg2t,int bit,int arg1b,int arg2b, ++ instruktion(const char mnem[],int arg1t,int arg2t,int bit,int arg1b,int arg2b, + int op ); + ~instruktion( ); + bool checkmatch( QString &mnem, int arg1t, int arg2t, int bits ); +--- droidbattles-1.0.6.orig/droidbattles/matchresult.h ++++ droidbattles-1.0.6/droidbattles/matchresult.h +@@ -28,4 +28,4 @@ + int mainbot; + }; + +-#endif +\ No newline at end of file ++#endif +--- droidbattles-1.0.6.orig/droidbattles/robots.cpp ++++ droidbattles-1.0.6/droidbattles/robots.cpp +@@ -21,7 +21,7 @@ + * Init bot position, load program file and graphics + */ + robots::robots( char *name,textmodeBattleArea &object,int mnum, confstruct config, +- int tm,bool er=true, bool ui=true ) ++ int tm,bool er, bool ui ) + { + useUI = ui; + int numdev = 0; +@@ -348,7 +348,7 @@ + /** + * Show bot gfx on screen + */ +-void robots::showobject( QWidget *buffer, int opt = 0 ) ++void robots::showobject( QWidget *buffer, int opt ) + { + int degrees = getdir( )+(degreesperpic/2); + if( degrees > 1023 ) +@@ -393,8 +393,8 @@ + /** + * Inbetween function for devices that wants to add screenobjects to battlearea + */ +-void robots::addscrobject( int X,int Y,int dir,int type, int arg1=0, +- int arg2=0, void *arg3=0 ) ++void robots::addscrobject( int X,int Y,int dir,int type, int arg1, ++ int arg2, void *arg3 ) + { + ourarea->addscrobject( mynum,X,Y,dir,type,arg1,arg2,arg3 ); + } +@@ -512,7 +512,7 @@ + /** + * Show error message (mainly for showing that bot doesn't conform to .cfg file) + */ +-void robots::error( char *string, char *name ) ++void robots::error( const char *string, const char *name ) + { + if( showerror && useUI ) + { +@@ -651,4 +651,4 @@ + break; + } + } +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/mine.cpp ++++ droidbattles-1.0.6/droidbattles/mine.cpp +@@ -20,7 +20,7 @@ + /** + * Init position and load gfx + */ +-mine::mine( int x,int y, textmodeBattleArea &area,int owner, bool ui = true ) ++mine::mine( int x,int y, textmodeBattleArea &area,int owner, bool ui ) + { + useUI = ui; + myowner = owner; +--- droidbattles-1.0.6.orig/droidbattles/textmodebattlearea.h ++++ droidbattles-1.0.6/droidbattles/textmodebattlearea.h +@@ -30,7 +30,7 @@ + #include <qfile.h> + #include "confstruct.h" + #include "screenobject.h" +-#include <iostream.h> ++#include <iostream> + + class textmodeBattleArea + { +--- droidbattles-1.0.6.orig/droidbattles/battlearea.cpp ++++ droidbattles-1.0.6/droidbattles/battlearea.cpp +@@ -21,12 +21,12 @@ + /** + * Constructor, inits area and starts first battle round + */ +-battlearea::battlearea( char *nam1,char *nam2,char *nam3,char *nam4, +- char *nam5,char *nam6,char *nam7,char *nam8,int numf, ++battlearea::battlearea( const char *nam1,const char *nam2,const char *nam3,const char *nam4, ++ const char * nam5,const char *nam6,const char *nam7,const char *nam8,int numf, + int mx, int xs, int ys, bool ifteams, int *bteams, +- bool tourney,bool fast,int mode=0,int maxp=10, +- bool ifdebug=false,QMultiLineEdit *dbedit=NULL, +- int *dbl=0, int *dbm=0 ) ++ bool tourney,bool fast,int mode,int maxp, ++ bool ifdebug,QMultiLineEdit *dbedit, ++ int *dbl, int *dbm ) + { + + debugenabled = ifdebug; +@@ -860,7 +860,7 @@ + * this function (via his bot) + */ + void battlearea::addscrobject( int owner,int X,int Y,int dir,int type, +- int arg1=0,int arg2=0, void *arg3=0 ) ++ int arg1,int arg2, void *arg3 ) + { + int x; + for( x=0;x<maxobjects;x++ ) +--- droidbattles-1.0.6.orig/droidbattles/droidbattles.cpp ++++ droidbattles-1.0.6/droidbattles/droidbattles.cpp +@@ -174,9 +174,7 @@ + + void DroidBattles::showdoc( ) + { +- QString temp = returninstalldir( ); +- temp += "/doc/index.html"; +- browser = new Docbrowser( temp ); ++ browser = new Docbrowser( "/usr/share/doc/droidbattles/html/index.html" ); + } + /** + * Executed when the user presses start single battle +--- droidbattles-1.0.6.orig/droidbattles/battlearea.h ++++ droidbattles-1.0.6/droidbattles/battlearea.h +@@ -56,8 +56,8 @@ + + public: + +- battlearea( char *name1,char *name2,char *name3,char *name4,char *name5, +- char *name6,char *name7,char *name8,int numf,int ,int xs, ++ battlearea( const char *name1,const char *name2,const char *name3,const char *name4,const char *name5, ++ const char *name6,const char *name7,const char *name8,int numf,int ,int xs, + int ys,bool ifteams,int *bteams, bool tourney,bool iffast, + int mode = 0, int maxp=10,bool ifdebug=false, + QMultiLineEdit *dbedit=NULL, int *dbl=0, int *dbm=0 ); +--- droidbattles-1.0.6.orig/droidbattles/device.cpp ++++ droidbattles-1.0.6/droidbattles/device.cpp +@@ -92,7 +92,7 @@ + { + } + +-void device::dospecial( int x, int y=0 ) ++void device::dospecial( int x, int y ) + { + } + +@@ -109,4 +109,4 @@ + } + portstack[port][3] = 0; + stacktaken[port][3] = false; +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/rocket.cpp ++++ droidbattles-1.0.6/droidbattles/rocket.cpp +@@ -28,7 +28,7 @@ + * Init position, gfx + */ + rocket::rocket( int X,int Y,int dir,int leng,int mnum, textmodeBattleArea &area, +- int owner, bool ui = true ) ++ int owner, bool ui ) + { + useUI = ui; + myowner = owner; +@@ -87,7 +87,7 @@ + /** + * Paint the flame from the rocket + */ +-void rocket::showobject( QWidget *buffer, int opt=0 ) ++void rocket::showobject( QWidget *buffer, int opt ) + { + QPainter p( buffer ); + p.setPen( QColor( 255,0,0 ) ); +--- droidbattles-1.0.6.orig/droidbattles/armor.cpp ++++ droidbattles-1.0.6/droidbattles/armor.cpp +@@ -146,8 +146,8 @@ + * The repair unit uses this function in order to not issue an interrupt + * every time he repairs. + */ +-void armor::dospecial( int x,int y=0 ) ++void armor::dospecial( int x,int y ) + { + ourbot->armorval -= x; + strength -= x; +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/instruktion.cpp ++++ droidbattles-1.0.6/droidbattles/instruktion.cpp +@@ -19,7 +19,7 @@ + + //Contains info about one mnemonic/operand combination for the assembler + +-instruktion::instruktion( char mnem[],int arg1t,int arg2t,int bit,int arg1b, ++instruktion::instruktion(const char mnem[],int arg1t,int arg2t,int bit,int arg1b, + int arg2b,int op ) + { + mnemonic = new char[strlen( mnem )+1]; +--- droidbattles-1.0.6.orig/droidbattles/beam.cpp ++++ droidbattles-1.0.6/droidbattles/beam.cpp +@@ -20,7 +20,7 @@ + /** + * Constructor , initializing and positioning beam + */ +-beam::beam( int X,int Y,int dir,int l,textmodeBattleArea &area, int owner, bool ui = true ) ++beam::beam( int X,int Y,int dir,int l,textmodeBattleArea &area, int owner, bool ui ) + { + useUI = ui; + myowner = owner; +@@ -86,7 +86,7 @@ + /** + * Paint object + */ +-void beam::showobject( QWidget *buffer,int opt=0 ) ++void beam::showobject( QWidget *buffer,int opt ) + { + QPainter p( buffer ); + p.setPen( QColor( 0,0,255 ) ); +@@ -119,4 +119,4 @@ + int beam::getcollisiontype( ) + { + return 2; +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/radarmissile.cpp ++++ droidbattles-1.0.6/droidbattles/radarmissile.cpp +@@ -21,7 +21,7 @@ + * Init positions, devices and load gfx + */ + radarmissile::radarmissile( int X,int Y,int dir,int bootm,int stm,int mnum, +- textmodeBattleArea &area, RAM *mem,int owner, bool ui = true ) ++ textmodeBattleArea &area, RAM *mem,int owner, bool ui ) + { + useUI = ui; + myowner = owner; +@@ -88,7 +88,7 @@ + /** + * Paint object gfx + */ +-void radarmissile::showobject( QWidget *buffer, int opt=0 ) ++void radarmissile::showobject( QWidget *buffer, int opt ) + { + if( opt == 0 ) + bitBlt( buffer,( getXpos( )>>6 )-4,( getYpos( )>>6 )-4,graphics ); +--- droidbattles-1.0.6.orig/droidbattles/droidbattles.conf ++++ droidbattles-1.0.6/droidbattles/droidbattles.conf +@@ -1,5 +1,5 @@ + [Installdir] +-/usr/local/droidbattles ++/usr/share/games/droidbattles + [docdir] + /doc + [botdir] +--- droidbattles-1.0.6.orig/droidbattles/main.cpp ++++ droidbattles-1.0.6/droidbattles/main.cpp +@@ -54,19 +54,19 @@ + { + if( argc < curarg+2 ) + { +- cout << " ERROR: -bot without following bot specification" << endl; ++ std::cout << " ERROR: -bot without following bot specification" << std::endl; + return; + } + if( numbots >= 8 ) + { +- cout << " ERROR: To many -bot specifications" << endl; ++ std::cout << " ERROR: To many -bot specifications" << std::endl; + return; + } + bots[numbots] = argv[curarg+1]; + QFile f( bots[numbots] ); + if( !f.exists( ) ) + { +- cout << " ERROR: Botfile " << bots[numbots] << " not found" << endl; ++ std::cout << " ERROR: Botfile " << bots[numbots] << " not found" << std::endl; + return; + } + curarg += 2; +@@ -93,13 +93,13 @@ + teamfight = true; + if( argc < curarg+2 ) + { +- cout << " ERROR: -team without following team specification" << endl; ++ std::cout << " ERROR: -team without following team specification" << std::endl; + return; + } + int temp = atoi( argv[curarg+1] ); + if( temp < 1 || temp > 4 ) + { +- cout << " ERROR: -team followed by invalid specification" << endl; ++ std::cout << " ERROR: -team followed by invalid specification" << std::endl; + return; + } + tteam = temp; +@@ -109,13 +109,13 @@ + { + if( argc < curarg+2 ) + { +- cout << " ERROR: -xsize without following size specification" << endl; ++ std::cout << " ERROR: -xsize without following size specification" << std::endl; + return; + } + int temp = atoi( argv[curarg+1] ); + if( temp < 8192 || temp > 65535 ) + { +- cout << " ERROR: -xsize followed by invalid specification" << endl; ++ std::cout << " ERROR: -xsize followed by invalid specification" << std::endl; + return; + } + xsize = temp; +@@ -125,13 +125,13 @@ + { + if( argc < curarg+2 ) + { +- cout << " ERROR: -ysize without following team specification" << endl; ++ std::cout << " ERROR: -ysize without following team specification" << std::endl; + return; + } + int temp = atoi( argv[curarg+1] ); + if( temp < 8192 || temp > 65535 ) + { +- cout << " ERROR: -ysize followed by invalid specification" << endl; ++ std::cout << " ERROR: -ysize followed by invalid specification" << std::endl; + return; + } + ysize = temp; +@@ -141,13 +141,13 @@ + { + if( argc < curarg+2 ) + { +- cout << " ERROR: -numfights without following specification" << endl; ++ std::cout << " ERROR: -numfights without following specification" << std::endl; + return; + } + int temp = atoi( argv[curarg+1] ); + if( temp < 1 ) + { +- cout << " ERROR: -numfights followed by invalid specification" << endl; ++ std::cout << " ERROR: -numfights followed by invalid specification" << std::endl; + return; + } + numfights = temp; +@@ -157,13 +157,13 @@ + { + if( argc < curarg+2 ) + { +- cout << " ERROR: -maxrounds without following specification" << endl; ++ std::cout << " ERROR: -maxrounds without following specification" << std::endl; + return; + } + int temp = atoi( argv[curarg+1] ); + if( temp < 100 ) + { +- cout << " ERROR: -maxrounds followed by invalid specification" << endl; ++ std::cout << " ERROR: -maxrounds followed by invalid specification" << std::endl; + return; + } + maxrounds = temp; +@@ -182,7 +182,7 @@ + } + } + else +- cout << " ERROR: Not enough bots specified" << endl; ++ std::cout << " ERROR: Not enough bots specified" << std::endl; + } + + int main( int argc, char *argv[] ) +--- droidbattles-1.0.6.orig/droidbattles/robcpu.h ++++ droidbattles-1.0.6/droidbattles/robcpu.h +@@ -37,7 +37,7 @@ + int returntype( ); + int returnspecial( ); + void sendmsg( char *msg ); +- struct debugcontents robCPU::returndbg( ); ++ struct debugcontents returndbg( ); + void execinstr( ); + }; + +--- droidbattles-1.0.6.orig/droidbattles/pixbutton.h ++++ droidbattles-1.0.6/droidbattles/pixbutton.h +@@ -33,7 +33,7 @@ + class PixButton : public QPushButton + { + public: +- PixButton( char *text,int pix,QWidget *parent,char *name=0 ); ++ PixButton( const char *text,int pix,QWidget *parent,char *name=0 ); + ~PixButton( ); + protected: + void drawButtonLabel( QPainter *paint ); +--- droidbattles-1.0.6.orig/droidbattles/installdir.cpp ++++ droidbattles-1.0.6/droidbattles/installdir.cpp +@@ -23,20 +23,6 @@ + * Get the installation dir + */ + +- //Open config file +- QString temp = "/etc/droidbattles.conf"; +- QString insdir; +- QFile f3( temp ); +- //If no config file exists, take the default location +- if( !f3.exists( ) ) +- { +- temp = "/usr/local/droidbattles"; +- return temp; +- } +- f3.open( IO_ReadOnly ); +- QTextStream s( &f3 ); +- s >> temp; //Read from file +- s >> insdir; +- f3.close( ); ++ QString insdir = "/usr/share/games/droidbattles"; + return insdir; +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/startsbatt.cpp ++++ droidbattles-1.0.6/droidbattles/startsbatt.cpp +@@ -250,4 +250,4 @@ + int startsbatt::getbotteam( int bot ) + { + return team[bot]->currentItem( ); +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/createbot.h ++++ droidbattles-1.0.6/droidbattles/createbot.h +@@ -52,7 +52,7 @@ + createbot( ); + ~createbot( ); + void closeEvent( QCloseEvent *e ); +- void error( char *string, int line ); ++ void error( const char *string, int line ); + void addint( QString & str,int integ ); + int devnum( int sort,int num ); + +--- droidbattles-1.0.6.orig/droidbattles/textmodefilemanip.cpp ++++ droidbattles-1.0.6/droidbattles/textmodefilemanip.cpp +@@ -32,7 +32,7 @@ + QFile fin( fname ); + if( !fin.open( IO_ReadOnly ) ) + { +- cout << "could not open file" << endl; ++ std::cout << "could not open file" << std::endl; + return; + } + QTextStream sin( &fin ); +@@ -40,7 +40,7 @@ + sin >> curline; + if( curline != QString( "RAM:" ) ) + { +- cout << "Botfile corrupt, (error reading RAM size)"; ++ std::cout << "Botfile corrupt, (error reading RAM size)"; + return; + } + +@@ -78,7 +78,7 @@ + int tint = curline.toInt( &ok ); + if( !ok || tint > 8 || tint < 0 ) + { +- cout << "Botfile corrupt, (error reading RAM size)"; ++ std::cout << "Botfile corrupt, (error reading RAM size)"; + return; + } + +@@ -130,14 +130,14 @@ + sin >> curline; + if( curline != QString( "DEVICE:" ) ) + { +- cout << "Botfile corrupt, (error reading DEVICES)"; ++ std::cout << "Botfile corrupt, (error reading DEVICES)"; + return; + } + sin >> curline; + tint = curline.toInt( &ok ); + if( !ok ) + { +- cout << "Botfile corrupt, (error reading DEVICES)"; ++ std::cout << "Botfile corrupt, (error reading DEVICES)"; + return; + } + +@@ -146,7 +146,7 @@ + tint = curline.toInt( &ok ); + if( !ok ) + { +- cout << "Botfile corrupt, (error reading DEVICES)"; ++ std::cout << "Botfile corrupt, (error reading DEVICES)"; + return; + } + mem[3+i*6] = tint; +@@ -154,7 +154,7 @@ + tint = curline.toInt( &ok ); + if( !ok ) + { +- cout << "Botfile corrupt, (error reading DEVICES)"; ++ std::cout << "Botfile corrupt, (error reading DEVICES)"; + return; + } + mem[4+i*6] = tint; +@@ -1093,13 +1093,13 @@ + existn[x] = true; + if( exist[1]==true ) + { +- cout << "Expected: only one token on line " << linenum << endl; ++ std::cout << "Expected: only one token on line " << linenum << std::endl; + goto ende; + } + } + else + { +- cout << "Expected: name of label on line" << linenum << endl; ++ std::cout << "Expected: name of label on line" << linenum << std::endl; + goto ende; + } + } +@@ -1119,13 +1119,13 @@ + existn[x] = true; + if( exist[1] == true ) + { +- cout << "Expected: only one token, line " << linenum << endl; ++ std::cout << "Expected: only one token, line " << linenum << std::endl; + goto ende; + } + } + else + { +- cout << "Expected: name of variable on line " << linenum << endl; ++ std::cout << "Expected: name of variable on line " << linenum << std::endl; + goto ende; + } + } +@@ -1149,18 +1149,18 @@ + } + else + { +- cout << "Expected: value of constant, line " << linenum << endl; ++ std::cout << "Expected: value of constant, line " << linenum << std::endl; + goto ende; + } + if(exist[2] == true) + { +- cout << "Expected: only two tokens, line " << linenum << endl; ++ std::cout << "Expected: only two tokens, line " << linenum << std::endl; + goto ende; + } + } + else + { +- cout << "Expected: name of constant on line " << linenum << endl; ++ std::cout << "Expected: name of constant on line " << linenum << std::endl; + goto ende; + } + } +@@ -1257,7 +1257,7 @@ + } + else + { +- cout << "Unknown symbol on line " << linenum << endl; ++ std::cout << "Unknown symbol on line " << linenum << std::endl; + goto ende; + } + } +@@ -1274,7 +1274,7 @@ + } + else + { +- cout << "Expected: value for org on line" << linenum << endl; ++ std::cout << "Expected: value for org on line" << linenum << std::endl; + goto ende; + } + } +@@ -1303,14 +1303,14 @@ + else + { + //Code for error in dev-value +- cout << "Value must be the number of a CPU device" << linenum << endl; ++ std::cout << "Value must be the number of a CPU device" << linenum << std::endl; + goto ende; + } + } + } + else + { +- cout << "Unknown symbol on line " << linenum << endl; ++ std::cout << "Unknown symbol on line " << linenum << std::endl; + goto ende; + } + } +@@ -1325,14 +1325,14 @@ + } + else + { +- cout << "Value must be the number of a CPU device, line " << linenum << endl; ++ std::cout << "Value must be the number of a CPU device, line " << linenum << std::endl; + goto ende; + } + } + } + else + { +- cout << "Expected: number of CPU device on line " << linenum << endl; ++ std::cout << "Expected: number of CPU device on line " << linenum << std::endl; + goto ende; + } + } +@@ -1360,14 +1360,14 @@ + else + { + //Code for error in dev-value +- cout << "Value must be the number of a CPU device, line " << linenum << endl; ++ std::cout << "Value must be the number of a CPU device, line " << linenum << std::endl; + goto ende; + } + } + } + else + { +- cout << "Unknown symbol on line " << linenum << endl; ++ std::cout << "Unknown symbol on line " << linenum << std::endl; + goto ende; + } + } +@@ -1382,14 +1382,14 @@ + } + else + { +- cout << "Value must be the number of a CPU device, line " << linenum << endl; ++ std::cout << "Value must be the number of a CPU device, line " << linenum << std::endl; + goto ende; + } + } + } + else + { +- cout << "Expected: number of CPU device, line " << linenum << endl; ++ std::cout << "Expected: number of CPU device, line " << linenum << std::endl; + goto ende; + } + } +@@ -1419,14 +1419,14 @@ + else + { + //Code for error in dev-value +- cout << "Value must be lower than 256" << linenum << endl; ++ std::cout << "Value must be lower than 256" << linenum << std::endl; + goto ende; + } + } + } + else + { +- cout << "Unknown symbol ,line" << linenum << endl; ++ std::cout << "Unknown symbol ,line" << linenum << std::endl; + goto ende; + } + } +@@ -1441,14 +1441,14 @@ + } + else + { +- cout << "Value must be lower than 256, line: " << linenum << endl; ++ std::cout << "Value must be lower than 256, line: " << linenum << std::endl; + goto ende; + } + } + } + else + { +- cout << "Expected: number of interrupt, line: " << linenum << endl; ++ std::cout << "Expected: number of interrupt, line: " << linenum << std::endl; + goto ende; + } + } +@@ -1806,7 +1806,7 @@ + i = 245; + if( tunres[3] == true ) + { +- cout << "Sorry, this instruction cant use symbols not declared yet " << linenum << endl; ++ std::cout << "Sorry, this instruction cant use symbols not declared yet " << linenum << std::endl; + goto ende; + } + goto found; +@@ -1819,7 +1819,7 @@ + i = 246; + if( tunres[2] == true ) + { +- cout << "Sorry, this instruction cant use symbols not declared yet " << linenum << endl; ++ std::cout << "Sorry, this instruction cant use symbols not declared yet " << linenum << std::endl; + goto ende; + } + goto found; +@@ -1832,7 +1832,7 @@ + goto found; + } + //If not success return error +- cout << "Error: unknown mnemonic/operand combination on line " << linenum << endl; ++ std::cout << "Error: unknown mnemonic/operand combination on line " << linenum << std::endl; + goto ende; + //If success write result + found: +@@ -1932,7 +1932,7 @@ + } + if( resolved[i] == false ) + { +- cout << "Undeclared symbol " << unresn[i] << " on line " << unresline[i] << endl; ++ std::cout << "Undeclared symbol " << unresn[i] << " on line " << unresline[i] << std::endl; + goto ende; + } + } +@@ -1946,11 +1946,11 @@ + } + else + { +- cout << "couldnt open outputfile" << endl; ++ std::cout << "couldnt open outputfile" << std::endl; + goto ende; + } + +- cout << "Assemble successful" << endl; ++ std::cout << "Assemble successful" << std::endl; + ende: + for( i=0;i<247;i++ ) + delete instr[i]; +@@ -1963,7 +1963,7 @@ + QFile f( tempname ); + if( !f.open( IO_ReadOnly ) ) + { +- cout << "Couldn't open config file" << endl; ++ std::cout << "Couldn't open config file" << std::endl; + return; + } + +@@ -2008,7 +2008,7 @@ + QFile b( filename ); + if( !b.open( IO_ReadOnly ) ) + { +- cout << "Couldn't open bot-file" << endl; ++ std::cout << "Couldn't open bot-file" << std::endl; + return; + } + QDataStream s2( &b ); +@@ -2017,14 +2017,14 @@ + s2.readBytes( tc,lng ); + unsigned char *my = (unsigned char *)&tc[0]; + if( my[1] > config.maxram ) //Read in all devices +- cout << "ERROR!, Max amount of ram" << endl; ++ std::cout << "ERROR!, Max amount of ram" << std::endl; + if( my[1] <= 9 ) + { + cost += config.ramcost[my[1]]; + } + else + { +- cout << "ERROR!, file format error" << endl; ++ std::cout << "ERROR!, file format error" << std::endl; + } + + int levelvalue = 0; +@@ -2033,7 +2033,7 @@ + if( my[x*6+2] <= NUMDEV ) + { + if( config.enabled[my[x*6+2]-1] == false && my[x*6+2] != 0 ) +- cout << "ERROR!, Using disabled device" << endl; ++ std::cout << "ERROR!, Using disabled device" << std::endl; + if( my[x*6+3] <= 4 && my[x*6+2] > 0 ) + { + numdev++; +@@ -2042,22 +2042,22 @@ + } + if( my[x*6+3] > 4 ) + { +- cout << "ERROR!, File format error" << endl; ++ std::cout << "ERROR!, File format error" << std::endl; + levelvalue = 0; + } + } + else + { +- cout << "ERROR!, File format error" << endl; ++ std::cout << "ERROR!, File format error" << std::endl; + } + } + if( numdev > config.maxdev ) +- cout << "ERROR!, Max number of devices" << endl; ++ std::cout << "ERROR!, Max number of devices" << std::endl; + if( cost > config.maxcost ) +- cout << "ERROR!, Max cost fo bot" << endl; ++ std::cout << "ERROR!, Max cost fo bot" << std::endl; + delete my; + +- cout << "Check finished" << endl; ++ std::cout << "Check finished" << std::endl; + } + + void textmodeFileManip::loadConfig( char *filename ) +@@ -2067,14 +2067,14 @@ + QFile f( fname ); + if( !f.open( IO_WriteOnly ) ) + { +- cout << "Couldnt open current.cfg... check permissions" << endl; ++ std::cout << "Couldnt open current.cfg... check permissions" << std::endl; + return; + } + fname = filename; + QFile f2( fname ); + if( !f2.open( IO_ReadOnly ) ) + { +- cout << "Couldnt open file ,"<< filename << " not found" << endl; ++ std::cout << "Couldnt open file ,"<< filename << " not found" << std::endl; + return; + } + +@@ -2087,13 +2087,13 @@ + QString temp; + s2 >> temp; + s2 >> temp; +- s << "MAXDEVICES: " << temp << endl; ++ s << "MAXDEVICES: " << temp << "\n"; + s2 >> temp; + s2 >> temp; +- s << "MAXCOSTS: " << temp << endl; ++ s << "MAXCOSTS: " << temp << "\n"; + s2 >> temp; + s2 >> temp; +- s << "MAXRAM: " << temp << endl; ++ s << "MAXRAM: " << temp << "\n"; + s << "RAMCOSTS:"; + s2 >> temp; + for( x=0; x<9;x++ ) +@@ -2101,7 +2101,7 @@ + s2 >> temp; + s << " " << temp ; + } +- s << endl; ++ s << "\n"; + for( x=0;x<numdev;x++ ) + { + s2 >> temp; +@@ -2114,7 +2114,7 @@ + s2 >> temp; + s << " " << temp; + } +- s << endl; ++ s << "\n"; + } + f.close( ); + f2.close( ); +--- droidbattles-1.0.6.orig/droidbattles/missile.cpp ++++ droidbattles-1.0.6/droidbattles/missile.cpp +@@ -20,7 +20,7 @@ + /** + * Init position, graphics and such + */ +-missile::missile( int X,int Y,int dir,int owner,int mnum, textmodeBattleArea &area, bool ui = true ) ++missile::missile( int X,int Y,int dir,int owner,int mnum, textmodeBattleArea &area, bool ui ) + { + useUI = ui; + myowner = owner; +@@ -70,7 +70,7 @@ + /** + * Paint the shot on the screen + */ +-void missile::showobject( QWidget *buffer,int opt = 0 ) ++void missile::showobject( QWidget *buffer,int opt ) + { + if( opt == 0 ) + bitBlt( buffer,( getXpos( )>>6 )-4,( getYpos( )>>6 )-4,graphics ); +--- droidbattles-1.0.6.orig/droidbattles/chaff.cpp ++++ droidbattles-1.0.6/droidbattles/chaff.cpp +@@ -20,7 +20,7 @@ + /** + * Constructor, Init object + */ +-chaff::chaff( int X,int Y,int d,int spd, textmodeBattleArea &area, bool ui = true ) ++chaff::chaff( int X,int Y,int d,int spd, textmodeBattleArea &area, bool ui ) + { + direction = d; + Xpos = X; +@@ -52,7 +52,7 @@ + /** + * Paint object + */ +-void chaff::showobject( QWidget *buffer,int opt=0 ) ++void chaff::showobject( QWidget *buffer,int opt ) + { + int picpos = 84-(int( timeleft/20 )* 12); + +@@ -103,4 +103,4 @@ + int chaff::returnradar( ) + { + return 5; +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/droidbattles/textmodebattlearea.cpp ++++ droidbattles-1.0.6/droidbattles/textmodebattlearea.cpp +@@ -26,7 +26,7 @@ + textmodeBattleArea::textmodeBattleArea( const char *nam1,const char *nam2,const char *nam3,const char *nam4, + const char *nam5,const char *nam6,const char *nam7,const char *nam8,int numf, + int mx, int xs, int ys, bool ifteams, int *bteams, +- bool tourney,int mode=0 ) ++ bool tourney,int mode ) + { + battlemode = mode; + maxpoints = numf; +@@ -413,7 +413,7 @@ + //Here, check if the battle has ended (eg. <= 1 bot or <= 1 team is left) + + int numofbots = 0; +- char botnum; ++ int botnum; + if( isteams ) //If teams + { + alive[0] = 0; +@@ -473,7 +473,7 @@ + // int ret = ermsg->exec( ); + // delete ermsg; + // QMessageBox::information( 0, "Fight Ended",msg ); +- cout << "Result: " << msg.data( ) << endl; ++ std::cout << "Result: " << msg.data( ) << std::endl; + return 3; + } + else +@@ -556,7 +556,7 @@ + break; + } + // QMessageBox::information( 0,"Fight ended",msg ); +- cout << "Result: " << msg.data( ) << endl; ++ std::cout << "Result: " << msg.data( ) << std::endl; + return 3; + } + } +@@ -584,7 +584,7 @@ + msg += " frags.\n"; + } + } +- cout << "Result: " << msg.data( ) << endl; ++ std::cout << "Result: " << msg.data( ) << std::endl; + return 3; + } + } +@@ -598,7 +598,7 @@ + * this function (via his bot) + */ + void textmodeBattleArea::addscrobject( int owner,int X,int Y,int dir,int type, +- int arg1=0,int arg2=0, void *arg3=0 ) ++ int arg1,int arg2, void *arg3 ) + { + int x; + for( x=0;x<maxobjects;x++ ) +--- droidbattles-1.0.6.orig/droidbattles/devchoice.cpp ++++ droidbattles-1.0.6/droidbattles/devchoice.cpp +@@ -22,7 +22,7 @@ + */ + + devchoice::devchoice( createbot *cre,QWidget *parent,const char *name, +- int num = 0 ) : QWidget( parent,name ) ++ int num ) : QWidget( parent,name ) + { + chosenlevel = 0; + dev = 0; +@@ -1098,4 +1098,4 @@ + } + // QMessageBox::information( this,"Devinfo",msg ); + showbox = new infobox( msg,0 ); +-} +\ No newline at end of file ++} +--- droidbattles-1.0.6.orig/chan ++++ droidbattles-1.0.6/chan +@@ -0,0 +1,17 @@ ++Thu May 5 20:04:55 EEST 2005 [EMAIL PROTECTED] ++ * Removed /etc/droidbattles.conf from use ++ ++Thu May 5 20:01:53 EEST 2005 [EMAIL PROTECTED] ++ * Make the docbrowser to look for docs from under /usr/share/doc ++ ++Wed May 4 04:27:46 EEST 2005 [EMAIL PROTECTED] ++ * Use correct dir for $prefix/share material ++ ++Wed May 4 02:13:39 EEST 2005 [EMAIL PROTECTED] ++ * Modernised the code. ++ ++Thu Apr 21 19:52:24 EEST 2005 [EMAIL PROTECTED] ++ tagged UPSTREAM_droidbattles_1.0.6 ++ ++Thu Apr 21 19:52:12 EEST 2005 [EMAIL PROTECTED] ++ * Import upstream droidbattles version 1.0.6 Added: packages/trunk/droidbattles/debian/patches/series =================================================================== --- packages/trunk/droidbattles/debian/patches/series (rev 0) +++ packages/trunk/droidbattles/debian/patches/series 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1 @@ +fixes.patch Added: packages/trunk/droidbattles/debian/rules =================================================================== --- packages/trunk/droidbattles/debian/rules (rev 0) +++ packages/trunk/droidbattles/debian/rules 2008-01-18 19:20:00 UTC (rev 5464) @@ -0,0 +1,95 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# 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 + +config.status: configure + dh_testdir + $(MAKE) -f /usr/share/quilt/quilt.make patch +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 + CFLAGS="$(CFLAGS)" ./configure \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --with-qt-includes=/usr/include/qt3/ + + +build: build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess config.log config.status + $(MAKE) -f /usr/share/quilt/quilt.make unpatch + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/droidbattles + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman debian/droidbattles.1 + dh_installexamples + dh_install debian/droidbattles.xpm /usr/share/pixmaps + # make install moves things to weird locations, fix that here. (kdevelop is weird.) + mv debian/droidbattles/usr/bin/droidbattles debian/droidbattles/usr/games/ + rmdir debian/droidbattles/usr/bin/ + mv debian/droidbattles/usr/local/droidbattles/doc/*.html debian/droidbattles/usr/share/doc/droidbattles/html/ + rm -r debian/droidbattles/usr/local/droidbattles/doc/ + rm debian/droidbattles/usr/local/droidbattles/COPYING # dh_installdocs copies these already + rm debian/droidbattles/usr/local/droidbattles/README # dh_installdocs copies these already + rm -r debian/droidbattles/usr/local/droidbattles/bots/ # dh_installexamples copies these already + mv debian/droidbattles/usr/local/droidbattles/ debian/droidbattles/usr/share/games/ + rmdir debian/droidbattles/usr/local + rm -r debian/droidbattles/etc # the droidbattles.conf file wasn't that useful + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install Property changes on: packages/trunk/droidbattles/debian/rules ___________________________________________________________________ Name: svn:executable + * _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
