--- bomberclone-0.11.9.orig/debian/compat +++ bomberclone-0.11.9/debian/compat @@ -0,0 +1 @@ +5 --- bomberclone-0.11.9.orig/debian/bomberclone.xpm +++ bomberclone-0.11.9/debian/bomberclone.xpm @@ -0,0 +1,115 @@ +/* XPM */ +static char *bomberclone[] = { +/* columns rows colors chars-per-pixel */ +"32 32 77 1", +" c #0C0A06", +". c #0E0D0D", +"X c #120F0D", +"o c #131008", +"O c #141313", +"+ c #191715", +"@ c #1D1914", +"# c #1D1B1B", +"$ c #201E1E", +"% c #211F20", +"& c #22211E", +"* c #2C2415", +"= c #2D271A", +"- c #3D341D", +"; c #242222", +": c #292624", +"> c #2C2927", +", c #2E2B29", +"< c #332D22", +"1 c #312E2C", +"2 c #34302E", +"3 c #3F3621", +"4 c #3B352C", +"5 c #363331", +"6 c #393534", +"7 c #3C3836", +"8 c #3E3A3A", +"9 c #423C31", +"0 c #413D3C", +"q c #4C422E", +"w c #43403F", +"e c #4D4333", +"r c #54472C", +"t c #584C35", +"y c #5E5134", +"u c #5F5239", +"i c #605338", +"p c #6D5D3A", +"a c #74623C", +"s c #444241", +"d c #484645", +"f c #4A4847", +"g c #4D4B4A", +"h c #514E4D", +"j c #5C5B5A", +"k c #615F5F", +"l c #63605F", +"z c #796844", +"x c #636061", +"c c #6C6C6C", +"v c #726F6F", +"b c #72706F", +"n c #747474", +"m c #7C7A79", +"M c #816E45", +"N c #807E7E", +"B c #81807F", +"V c #868584", +"C c #888787", +"Z c #898887", +"A c #8C8A8A", +"S c #908E8E", +"D c #969493", +"F c #9C9A9A", +"G c #A09F9E", +"H c #A5A5A5", +"J c #A8A7A6", +"K c #ABAAA9", +"L c #B3B3B3", +"P c #BEBEBE", +"I c #CDCCCC", +"U c #D5D5D5", +"Y c #DDDDDC", +"T c #E3E3E3", +"R c #EBEBEB", +"E c #F6F6F6", +"W c #FEFEFE", +/* pixels */ +"WWWWWWWWWEEWWWWWWWWWWWWWWWWWWWWW", +"WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW", +"WWWWWWWWWLxEWWWWWWWWWWWWWWWWWWWW", +"WWWWWWEc.OcWWWWWWWWWWWWWWWWWWWWW", +"WWWWWW8;PEWWWWWWWWWWWWWWWWWWWWWW", +"WWWEWn5WWWEWWWWWWWWWWWWWWWWWWWWW", +"WWWWWbcWEWWWWWWWWWWWWWWWWWWWWWWW", +"WWWWWR.LWRUWWWWEWEWWWWWWWWWWWWWW", +"WWWWWWHwWxZWIAxhggkSYWWWWWWWWWWW", +"WWWWWWWd5,sk7>,,,,<:6mYWWWWWWWWW", +"WWWWWWL05751552,14994>0IWWWWWWWW", +"WWWWWWF656765,:;<9iie917IWWWWWWW", +"WWWWWWWJ,665,:%$;##*rape<<5,VWWWWWW", +"WWWWWWEd5661>%#O@*-3<=>16wYWWWWW", +"WWWWWWJ:6651>%#O o@@$:,62HWWWWW", +"WWWWEWD;7671:;#O .O%;17,FWWWWW", +"WWWWWWx,6651,;#+OX.O#%:181BWWWWW", +"WWWWWWj,65551:%##O+#%;,587jEWWWW", +"WWWWWWj,66661,:;$$$;;:1586kEWWWW", +"WWWWWWm:656662,>::::,15801VWWWWW", +"WWWWWWJ>755656521,11557701JWWWWW", +"WWWWWWY855566666556677887sYWWWWW", +"WWWWWWEC;756666676777770,CWWWWWW", +"WWWWWWWTg,66566666767675gRWWWWWW", +"WWWWWWWWU7,7665666677050UWWWWWWW", +"WWWWWWWWWUf;577677776,gUWWWWWWWW", +"WWWWWWWWWWRV7:>111,17mTWWWWWWWWW", +"WWWWWWWWWWWWYHvjjjvJUEWWWWWWWWWW", +"WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW", +"WWWWWWWWWWWWWWWWWWWEWWWWWWWWWWWW", +"WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW" +}; --- bomberclone-0.11.9.orig/debian/docs +++ bomberclone-0.11.9/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- bomberclone-0.11.9.orig/debian/bomberclone.dirs +++ bomberclone-0.11.9/debian/bomberclone.dirs @@ -0,0 +1,2 @@ +usr/games +usr/share/pixmaps --- bomberclone-0.11.9.orig/debian/bomberclone.install +++ bomberclone-0.11.9/debian/bomberclone.install @@ -0,0 +1,3 @@ +debian/bomberclone.xpm usr/share/pixmaps/ +debian/tmp/usr/games usr/ +debian/bomberclone.desktop usr/share/applications/ --- bomberclone-0.11.9.orig/debian/watch +++ bomberclone-0.11.9/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/(\d)[\-_]?(rc\d+|pre-rc\d+|pre\d+a?)$/$1~$2/;s/[\-\.](source|Source|src|orig|unix)$//;s/-(bin|osx)$/~$1/;s/^v(\d)/$1/;" \ +http://sf.net/bomberclone/bomberclone[\-_](v?[\d\.]+(?:rc|rc\d+|pre-rc\d+|-unix|-source|-Source|-src|\.src|\.orig|[a-z]|b\d+|beta\d+-src|beta\d+)?)\.(?:tar\.gz|tgz|tar\.bz2|zip|pm\.gz|jar|shar\.gz|shar\.Z) --- bomberclone-0.11.9.orig/debian/copyright +++ bomberclone-0.11.9/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by Eduard Bloch on +Mon, 18 Aug 2003 19:49:22 +0200. + +It was downloaded from http://www.bomberclone.de/ or +http://sourceforge.net/project/showfiles.php?group_id=79449 . + +Upstream authors: + + Maintainer: + Steffen Pohle (steffen@bomberclone.de) + + Coding: + Steffen Pohle (steffen@bomberclone.de) + Patrick Wilczek + + Graphics: + TekkRat (playergfx, bombs, some tilesets) + +Copyright: + + Copyright (C) 2003-2007, Steffen Pohle + Copyright (C) 2003-2007, Patrick Wilczek + Copyright (C) 2003-2007, TekkRat + +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 St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- bomberclone-0.11.9.orig/debian/control +++ bomberclone-0.11.9/debian/control @@ -0,0 +1,28 @@ +Source: bomberclone +Section: games +Priority: extra +Maintainer: Bart Martens +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, findutils (>= 4.1.7-2), docbook-to-man, libpng-dev, libjpeg-dev +Standards-Version: 3.9.3 +Homepage: http://www.bomberclone.de/ + +Package: bomberclone +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, bomberclone-data (= ${source:Version}) +Description: free Bomberman clone + BomberClone is a free Bomberman-like game for Linux and Windows. The rules of + the game are simple: run through a level and bomb other players. It features + powerups that give you more strength, make you walk faster through the level, + or let you drop more bombs. + . + BomberClone can be played in multi-player mode via IPv4 or IPv6 networks or in + single-player mode against the local AI. + +Package: bomberclone-data +Architecture: all +Depends: ${misc:Depends} +Recommends: bomberclone +Description: Data files for bomberclone game + BomberClone is a free Bomberman-like game for Linux and Windows. + . + This package contains the data files needed to run the game. --- bomberclone-0.11.9.orig/debian/bomberclone.desktop +++ bomberclone-0.11.9/debian/bomberclone.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Bomberclone +Comment=Play a Bomberman like game +Icon=bomberclone +Exec=bomberclone +Terminal=false +Categories=Game; --- bomberclone-0.11.9.orig/debian/bomberclone-data.dirs +++ bomberclone-0.11.9/debian/bomberclone-data.dirs @@ -0,0 +1 @@ +usr/share/games/bomberclone --- bomberclone-0.11.9.orig/debian/menu +++ bomberclone-0.11.9/debian/menu @@ -0,0 +1,3 @@ +?package(bomberclone):needs="X11" section="Games/Action" \ + title="BomberClone" command="/usr/games/bomberclone" \ + icon="/usr/share/pixmaps/bomberclone.xpm" --- bomberclone-0.11.9.orig/debian/changelog +++ bomberclone-0.11.9/debian/changelog @@ -0,0 +1,114 @@ +bomberclone (0.11.9-4) unstable; urgency=low + + * Build-Depends: libpng-dev, libjpeg-dev. Closes: #669542. + + -- Bart Martens Tue, 01 May 2012 07:30:44 +0000 + +bomberclone (0.11.9-3) unstable; urgency=low + + * debian/patches/05_fix_gcc4.6_warning.diff: Added. Closes: #625311. + Patch by peter green , thanks. + + -- Bart Martens Sat, 20 Aug 2011 00:48:59 +0000 + +bomberclone (0.11.9-2) unstable; urgency=low + + * debian/patches/04_no-add-needed.diff: Added. Closes: #553970. + + -- Bart Martens Fri, 25 Feb 2011 20:04:35 +0000 + +bomberclone (0.11.9-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Tue, 15 Feb 2011 19:21:05 +0000 + +bomberclone (0.11.8-2) unstable; urgency=low + + * debian/patches/02_enter.diff: Fixes problem with enter key. + * debian/patches/03_sigsegv.diff: Fixes SIGSEGV's. Closes: #477196. + * debian/control, debian/rules: Use docbook-to-man. + * debian/control: Fixed typo. Closes: #466635. + * debian/bomberclone.desktop: Added. Closes: #457720. + * debian/watch: Updated. + + -- Bart Martens Tue, 23 Dec 2008 22:52:36 +0100 + +bomberclone (0.11.8-1) unstable; urgency=low + + * New upstream release. + * debian/*: Now using cdbs. + * debian/control: Fixed not-binnmuable-any-depends-all. + * debian/copyright: Updated. + * debian/menu: Updated to fit newest menu policy. + * debian/patches/01_cementery.diff: Added. + * debian/source.lintian-overrides: Removed obsolete overrides. + * debian/watch: Updated. + + -- Bart Martens Thu, 20 Dec 2007 18:31:06 +0100 + +bomberclone (0.11.7-1) unstable; urgency=low + + * New maintainer. Closes: #316569. + * New upstream release. Closes: #382082. That fixes CVE-2006-4005 and + CVE-2006-4006. + * debian/*: Repackaged with dh-make 0.41. + * debian/source.lintian-overrides: Added. + * debian/watch: Added. + + -- Bart Martens Sun, 20 Aug 2006 12:17:29 +0200 + +bomberclone (0.11.6.2-1) unstable; urgency=high + + * New upstream release + + fixes serious network bugs (closes: #316232) + * Applied patch by Tim Yamin to fix potential remote arbitrary code + execution [src/menu.c, src/menulabels.c, CVE-2006-0460] + * Fixed URLs in debian/copyright (closes: #354377) + + -- Eduard Bloch Wed, 1 Mar 2006 00:41:35 +0100 + +bomberclone (0.11.6-1) unstable; urgency=low + + * New upstream release + + -- Eduard Bloch Thu, 31 Mar 2005 03:25:52 +0200 + +bomberclone (0.11.5-1) unstable; urgency=low + + * New upstream release + * added the icon, converted to XPM@32x32 (closes: #275633) + + -- Eduard Bloch Tue, 28 Dec 2004 01:13:36 +0100 + +bomberclone (0.11.3-1) unstable; urgency=low + + * New upstream release + + -- Eduard Bloch Sun, 20 Jun 2004 01:52:57 +0200 + +bomberclone (0.11.2-1) unstable; urgency=low + + * New upstream release + * data lookup working again, removed configuration.c hacks + + -- Eduard Bloch Sat, 3 Apr 2004 20:41:38 +0200 + +bomberclone (0.10.1-1) unstable; urgency=low + + * New upstream release + + -- Eduard Bloch Fri, 19 Sep 2003 01:23:03 +0200 + +bomberclone (0.10.0-2) unstable; urgency=low + + * Re-added accidentaly removed dh_shlibdeps call, closes: #207282 + + -- Eduard Bloch Tue, 26 Aug 2003 09:13:34 +0200 + +bomberclone (0.10.0-1) unstable; urgency=low + + * Initial Release, closes: #206087 + + -- Eduard Bloch Mon, 18 Aug 2003 19:49:22 +0200 + --- bomberclone-0.11.9.orig/debian/rules +++ bomberclone-0.11.9/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --prefix=/usr \ + --bindir=/usr/games \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --datadir=/usr/share/games/bomberclone \ + +update-config:: + docbook-to-man debian/bomberclone.sgml > debian/bomberclone.6 + +clean:: + rm -f debian/bomberclone.6 + --- bomberclone-0.11.9.orig/debian/bomberclone.manpages +++ bomberclone-0.11.9/debian/bomberclone.manpages @@ -0,0 +1 @@ +debian/bomberclone.6 --- bomberclone-0.11.9.orig/debian/bomberclone.sgml +++ bomberclone-0.11.9/debian/bomberclone.sgml @@ -0,0 +1,194 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Eduard"> + Bloch"> + + August 18, 2003"> + + 6"> + blade@debian.org"> + + BOMBERCLONE"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; +
+ + &dhucpackage; + + &dhsection; + + + &dhpackage; + + free Bomberman-like game + + + + &dhpackage; + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; game. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + + + The goal of the game is to be the last one, who is alive. You can drop bombs which will explode after a certain time and destroy everything in horizontal and vertical direction. So you can remove stones or kill other players. But take care. Don't kill yourself otherwise the game will be over for you. + + +During the game you will find different powerups to raise your skills. If you are running faster than your opponent and you have many bombs, you can catch him within lots of bombs and he has no chance to escape. + + +You will get points for every player you have killed. If you win the game, you can earn additional points depending on how many players played the game. + + + + + POWERUPS + + + + + + + The Fire powerup gives your bombs more range. Maximum Range is 10. + + + + + + + + The Fire powerup gives your bombs more range. Maximum Range is 10. + + + + + + + + After picking up the Bomb item you can put one more bomb on the field. Maximum are 12 Bombs. + + + + + + + + After you collect this powerup you will walk a little bit faster. + + + + + + + SPECIALS + + + + + + + You can trigger the explosion of all your bombs by pressing the Special Use key. Warning don't wait to long or your bombs will explode anyway. + + + + + + + + Push your and other bombs around the maze. But be carefull that the bomb is not going to explode + + + + + + + + Lay a row of bombs in one direction to trap some players. To use this special, hold the Special use key and the direction key where you want to drop the row. + + + + + + + SEE ALSO + + http://www.bomberclone.de + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; Free Documentation + License, Version 1.1 or any later version published by the Free + Software Foundation; with no Invariant Sections, no Front-Cover + Texts and no Back-Cover Texts. + + +
+ + + + --- bomberclone-0.11.9.orig/debian/bomberclone-data.install +++ bomberclone-0.11.9/debian/bomberclone-data.install @@ -0,0 +1 @@ +debian/tmp/usr/share/games/bomberclone usr/share/games/ --- bomberclone-0.11.9.orig/debian/patches/01_cementery.diff +++ bomberclone-0.11.9/debian/patches/01_cementery.diff @@ -0,0 +1,25 @@ +Seems a typo. + + +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.9/data/tileset/cemetery/Makefile.am ./data/tileset/cemetery/Makefile.am +--- ../orig/bomberclone-0.11.9/data/tileset/cemetery/Makefile.am 2006-08-20 01:13:18.000000000 +0000 ++++ ./data/tileset/cemetery/Makefile.am 2011-02-15 19:33:21.000000000 +0000 +@@ -1,5 +1,5 @@ + +-bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cementery ++bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cemetery + + bomberclone_tileset_DATA = \ + background.png \ +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.9/data/tileset/cemetery/Makefile.in ./data/tileset/cemetery/Makefile.in +--- ../orig/bomberclone-0.11.9/data/tileset/cemetery/Makefile.in 2010-12-11 22:17:09.000000000 +0000 ++++ ./data/tileset/cemetery/Makefile.in 2011-02-15 19:33:46.000000000 +0000 +@@ -187,7 +187,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cementery ++bomberclone_tilesetdir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/tileset/cemetery + bomberclone_tileset_DATA = \ + background.png \ + stone96.png \ --- bomberclone-0.11.9.orig/debian/patches/02_enter.diff +++ bomberclone-0.11.9/debian/patches/02_enter.diff @@ -0,0 +1,96 @@ +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/game.c ./src/game.c +--- ../orig/bomberclone-0.11.8/src/game.c 2007-01-12 23:42:31.000000000 +0100 ++++ ./src/game.c 2008-12-23 22:51:50.000000000 +0100 +@@ -904,7 +904,7 @@ + bman.state = GS_startup; + } + +- if ((keys[SDLK_RETURN] || keys[SDLK_LCTRL] || keys[SDLK_RCTRL]) && (!keypressed) ++ if ((keys[SDLK_RETURN] || keys[SDLK_KP_ENTER] || keys[SDLK_LCTRL] || keys[SDLK_RCTRL]) && (!keypressed) + && (event.type = SDL_KEYDOWN)) { + done = 1; + keypressed = 1; +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/keyb.c ./src/keyb.c +--- ../orig/bomberclone-0.11.8/src/keyb.c 2005-08-07 19:46:21.000000000 +0200 ++++ ./src/keyb.c 2008-12-23 22:52:14.000000000 +0100 +@@ -187,7 +187,7 @@ + menu_displaytext ("Keyboard Config", "Please press the new key\nfor this function."); + + keys = SDL_GetKeyState (NULL); +- if (keys[SDLK_RETURN] || keys[SDLK_ESCAPE]) ++ if (keys[SDLK_RETURN] || keys[SDLK_KP_ENTER] || keys[SDLK_ESCAPE]) + keypressed = 1; + + timestamp = SDL_GetTicks (); // needed for time sync. +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/keybinput.c ./src/keybinput.c +--- ../orig/bomberclone-0.11.8/src/keybinput.c 2003-12-26 01:56:17.000000000 +0100 ++++ ./src/keybinput.c 2008-12-23 22:50:51.000000000 +0100 +@@ -65,7 +65,7 @@ + ki->len = strlen (ki->text); + } + +- if (keybinput_oldkey == SDLK_RETURN && event->type == SDL_KEYUP) ++ if ((keybinput_oldkey == SDLK_RETURN || keybinput_oldkey == SDLK_KP_ENTER) && event->type == SDL_KEYUP) + keyu = 1; + else if (keybinput_oldkey == SDLK_ESCAPE && event->type == SDL_KEYUP) + keyu = -1; +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/menubools.c ./src/menubools.c +--- ../orig/bomberclone-0.11.8/src/menubools.c 2004-05-20 18:55:30.000000000 +0200 ++++ ./src/menubools.c 2008-12-23 22:49:01.000000000 +0100 +@@ -40,7 +40,7 @@ + menu_focus_prev ((_menu *) mi->menu); + else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) + menu_focus_next ((_menu *) mi->menu); +- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) { ++ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) { + *(int *)mi->ptrdata = !(*(int *)mi->ptrdata); + menu_draw_bool (mi); + } +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/menubuttons.c ./src/menubuttons.c +--- ../orig/bomberclone-0.11.8/src/menubuttons.c 2004-05-20 18:55:30.000000000 +0200 ++++ ./src/menubuttons.c 2008-12-23 22:49:26.000000000 +0100 +@@ -95,7 +95,7 @@ + menu_focus_prev ((_menu *)mi->menu); + else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) + menu_focus_next ((_menu *)mi->menu); +- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) ++ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) + return 1; + break; + } +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/menuentrys.c ./src/menuentrys.c +--- ../orig/bomberclone-0.11.8/src/menuentrys.c 2004-05-20 18:55:30.000000000 +0200 ++++ ./src/menuentrys.c 2008-12-23 22:49:51.000000000 +0100 +@@ -150,7 +150,7 @@ + menu_focus_prev ((_menu *)mi->menu); + else if (event->key.keysym.sym == SDLK_DOWN) + menu_focus_next ((_menu *)mi->menu); +- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) ++ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) + menu_entry_save (mi); + else if (event->key.keysym.sym == SDLK_ESCAPE) + menu_entry_restore (mi); +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/menulists.c ./src/menulists.c +--- ../orig/bomberclone-0.11.8/src/menulists.c 2005-03-27 03:31:50.000000000 +0200 ++++ ./src/menulists.c 2008-12-23 22:50:17.000000000 +0100 +@@ -296,7 +296,7 @@ + menu_list_select_prev (mi); + else if (event->key.keysym.sym == SDLK_DOWN) + menu_list_select_next (mi); +- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) ++ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL) + return 1; + break; + case (SDL_KEYUP): +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/bomberclone-0.11.8/src/playermenu.c ./src/playermenu.c +--- ../orig/bomberclone-0.11.8/src/playermenu.c 2005-08-07 19:46:21.000000000 +0200 ++++ ./src/playermenu.c 2008-12-23 22:48:17.000000000 +0100 +@@ -176,7 +176,7 @@ + /* + * select the current gfx if aviable + */ +- else if (event.key.keysym.sym == SDLK_RETURN ++ else if (event.key.keysym.sym == SDLK_RETURN || event.key.keysym.sym == SDLK_KP_ENTER + || event.key.keysym.sym == SDLK_LCTRL || event.key.keysym.sym == SDLK_RCTRL + || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_drop] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_special] + || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_drop] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_special]) { --- bomberclone-0.11.9.orig/debian/patches/04_no-add-needed.diff +++ bomberclone-0.11.9/debian/patches/04_no-add-needed.diff @@ -0,0 +1,17 @@ +--- bomberclone-0.11.8.orig/src/Makefile.am ++++ bomberclone-0.11.8/src/Makefile.am +@@ -55,3 +55,4 @@ + windres -i bc-res.rc -o bc-res.o + rm bomberclone.ico + endif ++bomberclone_LDADD += -lm +--- bomberclone-0.11.8.orig/src/Makefile.in ++++ bomberclone-0.11.8/src/Makefile.in +@@ -234,6 +234,7 @@ + broadcast.c + + @MINGW32_TRUE@bomberclone_LDADD = bc-res.o ++bomberclone_LDADD += -lm + all: all-am + + .SUFFIXES: --- bomberclone-0.11.9.orig/debian/patches/05_fix_gcc4.6_warning.diff +++ bomberclone-0.11.9/debian/patches/05_fix_gcc4.6_warning.diff @@ -0,0 +1,295 @@ +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/bomb.c bomberclone-0.11.9.new//src/bomb.c +--- bomberclone-0.11.9//src/bomb.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/bomb.c 2011-08-11 20:12:48.000000000 +0000 +@@ -503,17 +503,12 @@ + * the bomb was kicked.. so move the bomb in the right way.. + */ + void bomb_kicked (_bomb * bomb) { +- float dist, dX, dY, pX, pY; ++ float dX, dY, pX, pY; + + pX = dX = bomb->dest.x - bomb->source.x; + pY = dY = bomb->dest.y - bomb->source.y; + if (pX < 0.0f) pX = -dX; + if (pY < 0.0f) pY = -dY; +- if (pX == 0.0f) dist = pY; +- else if (pY == 0.0f) dist = pX; +- else { +- dist = sqrtf (powf (pX,2) + powf (pY,2)); +- } + + bomb->fdata += timediff; // * (SPECIAL_KICK_MAXDIST / dist); + if (bomb->fdata >= 1.0f) { +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/gfx.c bomberclone-0.11.9.new//src/gfx.c +--- bomberclone-0.11.9//src/gfx.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/gfx.c 2011-08-11 20:12:48.000000000 +0000 +@@ -37,8 +37,7 @@ + void + gfx_load_players (int sx, int sy) + { +- float sfkt, +- ssfkt; ++ float sfkt; + char filename[255]; + int i, + r, +@@ -47,7 +46,6 @@ + SDL_Surface *tmpimage, + *tmpimage1; + sfkt = ((float) sx) / ((float) GFX_IMGSIZE); +- ssfkt = ((float) GFX_SMALLPLAYERIMGSIZE_X) / ((float) GFX_IMGSIZE); + + d_printf ("gfx_load_players (%d, %d)\n", sx, sy); + +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/gfxpixelimage.c bomberclone-0.11.9.new//src/gfxpixelimage.c +--- bomberclone-0.11.9//src/gfxpixelimage.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/gfxpixelimage.c 2011-08-11 20:12:48.000000000 +0000 +@@ -285,10 +285,6 @@ + SDL_Surface * + makegray_image (SDL_Surface * org) + { +- Uint32 rmask, +- gmask, +- bmask, +- amask; + Uint32 pixel, + transpixel = 0; + SDL_Surface *dest; +@@ -300,18 +296,6 @@ + b, + gray; + +-#if SDL_BYTEORDER == SDL_BIG_ENDIAN +- rmask = 0xff000000; +- gmask = 0x00ff0000; +- bmask = 0x0000ff00; +- amask = 0x000000ff; +-#else /* */ +- rmask = 0x000000ff; +- gmask = 0x0000ff00; +- bmask = 0x00ff0000; +- amask = 0xff000000; +-#endif /* */ +- + dest = SDL_CreateRGBSurface (SDL_SWSURFACE, org->w, org->h, org->format->BitsPerPixel, + org->format->Rmask, org->format->Gmask, + org->format->Bmask, org->format->Amask); +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/keyb.c bomberclone-0.11.9.new//src/keyb.c +--- bomberclone-0.11.9//src/keyb.c 2011-08-11 20:12:47.000000000 +0000 ++++ bomberclone-0.11.9.new//src/keyb.c 2011-08-11 20:13:43.000000000 +0000 +@@ -180,8 +180,7 @@ + void keyb_config_joypad (int key) { + unsigned int n = 0; + SDL_Event event; +- Uint8 *keys; +- int keypressed = 0, done = 0, eventstate = 0, reorder = 0, i, j; ++ int done = 0, eventstate = 0, reorder = 0, i, j; + + if (joy[0] == NULL || key < 0 || key >= BCK_max) return; + +@@ -189,9 +188,6 @@ + + menu_displaytext ("Joypad Config", "Please press the new key\nfor this function."); + +- keys = SDL_GetKeyState (NULL); +- if (keys[SDLK_RETURN] || keys[SDLK_ESCAPE]) +- keypressed = 1; + + timestamp = SDL_GetTicks (); // needed for time sync. + +@@ -245,9 +241,7 @@ + void keyb_config_readkey (int key) { + int newkey; + SDL_Event event; +- Uint8 *keys; +- int keypressed = 0, +- done = 0, ++ int done = 0, + eventstate = 0, + reorder = 0; + newkey = 0; +@@ -258,9 +252,6 @@ + + menu_displaytext ("Keyboard Config", "Please press the new key\nfor this function."); + +- keys = SDL_GetKeyState (NULL); +- if (keys[SDLK_RETURN] || keys[SDLK_KP_ENTER] || keys[SDLK_ESCAPE]) +- keypressed = 1; + + timestamp = SDL_GetTicks (); // needed for time sync. + +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/mapmenu.c bomberclone-0.11.9.new//src/mapmenu.c +--- bomberclone-0.11.9//src/mapmenu.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/mapmenu.c 2011-08-11 20:12:48.000000000 +0000 +@@ -174,15 +174,13 @@ + { + _keybinput ki; + SDL_Event event; +- int x, +- y, ++ int y, + eventstate, + done = 0; + char text[255]; + + // draw_menubox (WIN_X, WIN_Y); + +- x = gfx.res.x / 2; + y = gfx.res.y / 2 - WIN_Y / 2; + + sprintf (text, "Map Settings"); +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/menu.c bomberclone-0.11.9.new//src/menu.c +--- bomberclone-0.11.9//src/menu.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/menu.c 2011-08-11 20:12:48.000000000 +0000 +@@ -591,11 +591,10 @@ + menuselect; + _charlist *selfile = flist; + _menu *menu; +- _menuitem *dirmi; + + flcnt = menu_create_dirlist (path, dirflags, flist, MAX_DIRENTRYS); + menu = menu_new (title, 300, 300); +- dirmi = menu_create_list (menu, "Dir", -1, 50, 200, 200, flist, &selfile, 1); ++ menu_create_list (menu, "Dir", -1, 50, 200, 200, flist, &selfile, 1); + menu_create_button (menu, "OK", -1, 270, 150, 0); + menu_focus_id (menu, 1); + +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/netsrvlist.c bomberclone-0.11.9.new//src/netsrvlist.c +--- bomberclone-0.11.9//src/netsrvlist.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/netsrvlist.c 2011-08-11 20:12:48.000000000 +0000 +@@ -124,7 +124,6 @@ + _charlist *sel_entry = &srvlst_text[0]; + _menu *menu; + _menuitem *srvlst_listmenu; +- _menuitem *srvlst_entry; + SDL_Event event; + + d_printf ("net_getserver\n"); +@@ -137,7 +136,7 @@ + + menu = menu_new ("Join a Game", 500, 400); + srvlst_listmenu = menu_create_list (menu, "Host a Game", -1, 50, 475, 250, srvlst_text, &sel_entry, 1); +- srvlst_entry = menu_create_entry (menu, "IP :", -1, 320, 475, bman.servername, LEN_SERVERNAME+LEN_PORT + 2, MENU_entrytext, 2); ++ menu_create_entry (menu, "IP :", -1, 320, 475, bman.servername, LEN_SERVERNAME+LEN_PORT + 2, MENU_entrytext, 2); + menu_create_button (menu, "OK", -1, 350, 150, 0); + menu_focus_id (menu, 1); + +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/network.c bomberclone-0.11.9.new//src/network.c +--- bomberclone-0.11.9//src/network.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/network.c 2011-08-11 20:12:48.000000000 +0000 +@@ -460,7 +460,6 @@ + net_transmit_gamedata () + { + int done = 0, +- keypressed = 0, + x, + y, // network upload status for one step + p, +@@ -621,12 +620,9 @@ + if (keys[SDLK_ESCAPE] && event.type == SDL_KEYDOWN) { + done = 1; + bman.p_nr = -1; +- keypressed = 1; + bman.state = GS_startup; + } + +- if (event.type == SDL_KEYUP) +- keypressed = 0; + } + + timestamp = SDL_GetTicks (); // needed for time sync. +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/player.c bomberclone-0.11.9.new//src/player.c +--- bomberclone-0.11.9//src/player.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/player.c 2011-08-11 20:12:48.000000000 +0000 +@@ -120,7 +120,6 @@ + { + int i, + x, +- xs, + xe, + y, + ys, +@@ -155,7 +154,6 @@ + if (ye >= map.size.y) + ye = map.size.y - 1; + // redrawing of the stone +- xs = x; + for (; x <= xe; x++) + for (y = ys; y <= ye; y++) + stonelist_add (x, y); +@@ -445,7 +443,7 @@ + void + player_move (int pl_nr) + { +- int oldd, coll_speed; ++ int oldd; + _player *p = &players[pl_nr]; + + if (p->tunnelto > 0.0f) { +@@ -460,7 +458,6 @@ + player_animation (p); + oldd = p->d; + p->stepsleft = p->speed * timefactor; +- coll_speed = p->collect_shoes; + do { + p->d = oldd; + } while ((p->stepsleft = stepmove_player (pl_nr)) > 0); +@@ -677,9 +674,7 @@ + player_calcpos () + { + _player *pl; +- int oldm, +- oldd, +- p; ++ int p; + float oldspeed; + + for (p = 0; p < MAX_PLAYERS; p++) { +@@ -687,8 +682,6 @@ + if (PS_IS_netplayer (pl->state) && PS_IS_alife (pl->state) && pl->m != 0) { + player_animation (pl); + oldspeed = pl->speed; +- oldm = pl->m; +- oldd = pl->d; + if (pl->speed > 0.0) { + pl->speed *= timefactor; + stepmove_player (p); +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/single.c bomberclone-0.11.9.new//src/single.c +--- bomberclone-0.11.9//src/single.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/single.c 2011-08-11 20:12:48.000000000 +0000 +@@ -711,7 +711,6 @@ + _charlist nrplayerlist[MAX_PLAYERS + 1]; + _charlist *selnrplayer = &nrplayerlist[bman.ai_players]; + _menu *menu; +- _menuitem *aiplayer = NULL; + SDL_Event event; + + /* fill in the nrplayerlist */ +@@ -729,7 +728,7 @@ + menu = menu_new ("Single Game", 380,240); + + menu_create_text (menu, "numpl", 20, 50, 12, 2, COLOR_yellow, "Number of\nAI Players"); +- aiplayer = menu_create_list (menu, "AI Players", 40, 90, 50, 100, nrplayerlist, &selnrplayer, 3); ++ menu_create_list (menu, "AI Players", 40, 90, 50, 100, nrplayerlist, &selnrplayer, 3); + + menu_create_button (menu,"Change Playernames" ,160, 50, 210, 4); + +diff -Nur -x '*.orig' -x '*~' bomberclone-0.11.9//src/tileset.c bomberclone-0.11.9.new//src/tileset.c +--- bomberclone-0.11.9//src/tileset.c 2011-08-11 20:12:41.000000000 +0000 ++++ bomberclone-0.11.9.new//src/tileset.c 2011-08-11 20:12:48.000000000 +0000 +@@ -72,7 +72,6 @@ + char tileset[LEN_TILESETNAME]; + SDL_Surface *tmpimage, + *tmpimage1; +- float sfkt; + + d_printf ("Loading Tileset: %s\n", tilesetname); + strncpy (tileset, tilesetname, LEN_TILESETNAME); +@@ -101,7 +100,6 @@ + + /* create Table of points */ + scale (gfx.postab, gfx.block.x, 256); +- sfkt = ((float) gfx.block.x) / ((float) GFX_IMGSIZE); + + /* calculating the best offset for the field on the screen */ + gfx.offset.x = (gfx.res.x - (gfx.block.x * map.size.x)) / 2; --- bomberclone-0.11.9.orig/debian/patches/03_sigsegv.diff +++ bomberclone-0.11.9/debian/patches/03_sigsegv.diff @@ -0,0 +1,22 @@ +Fixes SIGSEGV's. + +--- ../orig/bomberclone-0.11.8/src/packets.c 2007-08-05 20:30:52.000000000 +0200 ++++ src/packets.c 2008-12-27 20:31:06.000000000 +0100 +@@ -251,7 +251,9 @@ + return; + } + ++ if( ct_pkg && ct_pkg->to >= 0 ) // second SIGSEGV Debian bug 477196 + players[ct_pkg->to].net.flags &= (0xFF - NETF_firewall); ++ if( ct_pkg && ct_pkg->to >= 0 ) // second SIGSEGV Debian bug 477196 + net_game_send_player (ct_pkg->to); + } + +@@ -1861,6 +1863,7 @@ + * check if the packet is from a player in the game and not from someone else + * this exception is only for PKG_joingame, PKG_error */ + addr->pl_nr = get_player_nr (addr->host, addr->port); ++ if( addr->pl_nr >= 0 ) // first SIGSEGV Debian bug 477196 + if ((addr->pl_nr < 0 || addr->pl_nr >= MAX_PLAYERS) && packet->h.typ > PKG_joingame + && PS_IS_netplayer (players[addr->pl_nr].state)) { + d_printf ("do_pkg: error addr->pl_nr out of range\n");