diff -Nru bomberclone-0.11.9/debian/bomberclone-data.install bomberclone-0.11.9/debian/bomberclone-data.install --- bomberclone-0.11.9/debian/bomberclone-data.install 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/bomberclone-data.install 2015-07-02 09:27:27.000000000 +0000 @@ -1 +1 @@ -debian/tmp/usr/share/games/bomberclone usr/share/games/ +usr/share/games/bomberclone usr/share/games/ diff -Nru bomberclone-0.11.9/debian/bomberclone.desktop bomberclone-0.11.9/debian/bomberclone.desktop --- bomberclone-0.11.9/debian/bomberclone.desktop 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/bomberclone.desktop 2015-07-02 09:27:27.000000000 +0000 @@ -2,7 +2,9 @@ Type=Application Name=Bomberclone Comment=Play a Bomberman like game +Comment[de]=spiele ein Spiel ähnlich wie Bomberman Icon=bomberclone Exec=bomberclone Terminal=false -Categories=Game; +Categories=Game;ArcadeGame; +Keywords=bombs;arcade;clone;powerups;multi-player;single-player;network;bomberman; diff -Nru bomberclone-0.11.9/debian/bomberclone.install bomberclone-0.11.9/debian/bomberclone.install --- bomberclone-0.11.9/debian/bomberclone.install 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/bomberclone.install 2015-07-02 09:27:27.000000000 +0000 @@ -1,3 +1,3 @@ -debian/bomberclone.xpm usr/share/pixmaps/ -debian/tmp/usr/games usr/ debian/bomberclone.desktop usr/share/applications/ +debian/bomberclone.xpm usr/share/pixmaps/ +usr/games/bomberclone diff -Nru bomberclone-0.11.9/debian/changelog bomberclone-0.11.9/debian/changelog --- bomberclone-0.11.9/debian/changelog 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/changelog 2015-07-02 09:27:27.000000000 +0000 @@ -1,3 +1,26 @@ +bomberclone (0.11.9-6) unstable; urgency=medium + + * d/patches/06_gcc5.patch: fixing build for s390, powerpc, mips + * d/rules: enabled autoreconf to fix arm64 build + * d/patches/04_no-add-needed.diff: fixing condition error (MINGW32) + + -- Peter Spiess-Knafl Thu, 02 Jul 2015 11:25:26 +0200 + +bomberclone (0.11.9-5) unstable; urgency=medium + + * New maintainer, mutually agreement (Closes: #790143) + * Switch to dpkg-source 3.0 (quilt) format + * Migrated from cdbs to dh9 + * d/patches/*: added description for existing patches + * d/control: extended bomberclone-data description + * d/control: Standards-Version 3.9.6: no changes required + * d/control: Added Vcs-* references + * d/copyright: updated to DEP-5 machine readable copyright format + * Added patch for gcc5 support (Closes: #777803) + * d/bomberclone.desktop: added categories (Closes: #737833) + + -- Peter Spiess-Knafl Sun, 28 Jun 2015 21:29:44 +0200 + bomberclone (0.11.9-4) unstable; urgency=low * Build-Depends: libpng-dev, libjpeg-dev. Closes: #669542. diff -Nru bomberclone-0.11.9/debian/compat bomberclone-0.11.9/debian/compat --- bomberclone-0.11.9/debian/compat 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/compat 2015-07-02 09:27:27.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru bomberclone-0.11.9/debian/control bomberclone-0.11.9/debian/control --- bomberclone-0.11.9/debian/control 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/control 2015-07-02 09:27:27.000000000 +0000 @@ -1,14 +1,27 @@ 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 +Maintainer: Peter Spiess-Knafl +Build-Depends: autotools-dev, + debhelper (>= 9), + dh-autoreconf, + docbook-to-man, + findutils (>= 4.1.7-2), + libjpeg-dev, + libpng-dev, + libsdl-image1.2-dev, + libsdl-mixer1.2-dev, + libsdl1.2-dev +Standards-Version: 3.9.6 Homepage: http://www.bomberclone.de/ +Vcs-Git: git://anonscm.debian.org/collab-maint/bomberclone.git +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/bomberclone.git Package: bomberclone Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, bomberclone-data (= ${source:Version}) +Depends: bomberclone-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} 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 @@ -23,6 +36,13 @@ Depends: ${misc:Depends} Recommends: bomberclone Description: Data files for bomberclone game - BomberClone is a free Bomberman-like game for Linux and Windows. + 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. . - This package contains the data files needed to run the game. + This package contains the data files (sounds, graphics) needed to run + the game. diff -Nru bomberclone-0.11.9/debian/copyright bomberclone-0.11.9/debian/copyright --- bomberclone-0.11.9/debian/copyright 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/copyright 2015-07-02 09:27:27.000000000 +0000 @@ -1,42 +1,32 @@ -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'. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: bomberclone +Source: http://sourceforge.net/projects/bomberclone/ + +Files: * +Copyright: 2003-2007 Steffen Pohle + 2003-2007 Patrick Wilczek + 2003-2007 TekkRat +License: GPL-2 + +Files: debian/* +Copyright: 2015 Peter Spiess-Knafl + 2006-2015 Bart Martens + 2003-2006 Eduard Bloch +License: GPL-2 + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of version 2 of the the GNU General Public License + as published by the Free Software Foundation. + . + 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 full text of the GNU General Public License + version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. diff -Nru bomberclone-0.11.9/debian/patches/01_cementery.diff bomberclone-0.11.9/debian/patches/01_cementery.diff --- bomberclone-0.11.9/debian/patches/01_cementery.diff 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/01_cementery.diff 2015-07-02 09:27:27.000000000 +0000 @@ -1,5 +1,5 @@ -Seems a typo. - +Subject: Fix typo: cementery -> cemetery +Forwarded: http://sourceforge.net/p/bomberclone/mailman/bomberclone-devel/ 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 diff -Nru bomberclone-0.11.9/debian/patches/02_enter.diff bomberclone-0.11.9/debian/patches/02_enter.diff --- bomberclone-0.11.9/debian/patches/02_enter.diff 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/02_enter.diff 2015-07-02 09:27:27.000000000 +0000 @@ -1,7 +1,9 @@ -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 @@ +Subject: Check for Enter + Return in user input +Forwarded: http://sourceforge.net/p/bomberclone/mailman/bomberclone-devel + +--- a/src/game.c ++++ b/src/game.c +@@ -916,7 +916,7 @@ bman.state = GS_startup; } @@ -10,10 +12,9 @@ && (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 @@ +--- a/src/keyb.c ++++ b/src/keyb.c +@@ -259,7 +259,7 @@ menu_displaytext ("Keyboard Config", "Please press the new key\nfor this function."); keys = SDL_GetKeyState (NULL); @@ -22,9 +23,8 @@ 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 +--- a/src/keybinput.c ++++ b/src/keybinput.c @@ -65,7 +65,7 @@ ki->len = strlen (ki->text); } @@ -34,9 +34,8 @@ 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 +--- a/src/menubools.c ++++ b/src/menubools.c @@ -40,7 +40,7 @@ menu_focus_prev ((_menu *) mi->menu); else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) @@ -46,9 +45,8 @@ *(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 +--- a/src/menubuttons.c ++++ b/src/menubuttons.c @@ -95,7 +95,7 @@ menu_focus_prev ((_menu *)mi->menu); else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN) @@ -58,9 +56,8 @@ 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 +--- a/src/menuentrys.c ++++ b/src/menuentrys.c @@ -150,7 +150,7 @@ menu_focus_prev ((_menu *)mi->menu); else if (event->key.keysym.sym == SDLK_DOWN) @@ -70,9 +67,8 @@ 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 +--- a/src/menulists.c ++++ b/src/menulists.c @@ -296,7 +296,7 @@ menu_list_select_prev (mi); else if (event->key.keysym.sym == SDLK_DOWN) @@ -82,9 +78,8 @@ 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 +--- a/src/playermenu.c ++++ b/src/playermenu.c @@ -176,7 +176,7 @@ /* * select the current gfx if aviable diff -Nru bomberclone-0.11.9/debian/patches/03_sigsegv.diff bomberclone-0.11.9/debian/patches/03_sigsegv.diff --- bomberclone-0.11.9/debian/patches/03_sigsegv.diff 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/03_sigsegv.diff 2015-07-02 09:27:27.000000000 +0000 @@ -1,22 +1,26 @@ -Fixes SIGSEGV's. +Subject: Fixes SIGSEGV's. +Forwarded: http://sourceforge.net/p/bomberclone/mailman/bomberclone-devel/ ---- ../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; - } +--- a/src/packets.c ++++ b/src/packets.c +@@ -256,8 +256,10 @@ + * some hardware router */ + if (ct_pkg->to == -1) 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); +- players[ct_pkg->to].net.flags &= (0xFF - NETF_firewall); +- net_game_send_player (ct_pkg->to); ++ 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 @@ + /* if a client get this packet we send a packet +@@ -1871,6 +1873,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 ) // 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"); diff -Nru bomberclone-0.11.9/debian/patches/04_no-add-needed.diff bomberclone-0.11.9/debian/patches/04_no-add-needed.diff --- bomberclone-0.11.9/debian/patches/04_no-add-needed.diff 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/04_no-add-needed.diff 2015-07-02 09:27:27.000000000 +0000 @@ -1,17 +1,19 @@ ---- 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 @@ +Subject: Link against libmath +Forwarded: http://sourceforge.net/p/bomberclone/mailman/bomberclone-devel/ + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -46,12 +46,4 @@ + playermenu.c\ broadcast.c - @MINGW32_TRUE@bomberclone_LDADD = bc-res.o -+bomberclone_LDADD += -lm - all: all-am - - .SUFFIXES: +-if MINGW32 +-bomberclone_LDADD = bc-res.o +- +- +-bc-res.o: bc-res.rc +- ln -sf ../data/pixmaps/bomberclone.ico ./ +- windres -i bc-res.rc -o bc-res.o +- rm bomberclone.ico +-endif ++bomberclone_LDADD = -lm diff -Nru bomberclone-0.11.9/debian/patches/05_fix_gcc4.6_warning.diff bomberclone-0.11.9/debian/patches/05_fix_gcc4.6_warning.diff --- bomberclone-0.11.9/debian/patches/05_fix_gcc4.6_warning.diff 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/05_fix_gcc4.6_warning.diff 2015-07-02 09:27:27.000000000 +0000 @@ -1,3 +1,6 @@ +Subject: Fix gcc 4.6 warnings +Forwarded: http://sourceforge.net/p/bomberclone/mailman/bomberclone-devel/ + 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 diff -Nru bomberclone-0.11.9/debian/patches/06_gcc5.patch bomberclone-0.11.9/debian/patches/06_gcc5.patch --- bomberclone-0.11.9/debian/patches/06_gcc5.patch 1970-01-01 00:00:00.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/06_gcc5.patch 2015-07-02 09:27:27.000000000 +0000 @@ -0,0 +1,179 @@ +From: Peter Spiess-Knafl +Subject: Fix build for gcc5 +Bug-Debian: http://bugs.debian.org/777803 +Forwarded: via private mail to steffen@bomberclone.de + +--- a/include/bomb.h ++++ b/include/bomb.h +@@ -49,7 +49,7 @@ + // for the bomb.. + extern void bomb_loop (); + extern void bomb_explode (_bomb * bomb, int net); +-extern inline void bomb_action (_bomb * bomb); ++ + extern void bomb_move (_bomb * bomb); + extern void bomb_kicked (_bomb * bomb); + extern void get_bomb_on (float x, float y, _point bombs[]); +--- a/include/menu.h ++++ b/include/menu.h +@@ -86,10 +86,10 @@ + extern void menu_draw (_menu *menu); + extern void menu_draw_border (_menu *menu); + extern void menu_draw_background (_menu *menu, SDL_Rect *dest); +-extern inline void menu_draw_menuitem (_menuitem *m); ++ + extern void menu_del_menuitem (_menuitem *m); + extern void menu_reload (_menu *menu); +-extern inline void menu_reload_menuitem (_menuitem *m); ++ + extern void menu_focus_next (_menu *menu); + extern void menu_focus_prev (_menu *menu); + extern void menu_focus_id (_menu *menu, int id); +--- a/include/player.h ++++ b/include/player.h +@@ -158,7 +158,7 @@ + extern void player_checkdeath (int pnr); + extern void player_check (int pl_nr); + extern void player_delete (int pl_nr); +- ++extern void playerinput_keyb_read (int pk_offset, int pl_nr); + extern void player2_join (); + extern void player2_add (int pl_nr); + +@@ -168,7 +168,7 @@ + // for the playerinput handling + extern void playerinput_loop (int pl_nr); + extern void playerinput_keyb_loop (int pl_nr); +-extern inline void playerinput_keyb_read (int pk_offset, int pl_nr); ++ + + /* playermenu.c */ + extern void playernamemenu (); +--- a/include/single.h ++++ b/include/single.h +@@ -9,8 +9,7 @@ + extern void single_menu (); + extern int single_select_player (); + extern int ai_choosedir (int dir, int nearbomb, int oldpos); +-extern inline int ai_invertdir (int dir); +-extern inline int ai_checkpos (_player * pl, _point * pos); ++ + extern int ai_findnearbombs (_point pos); + extern int ai_findbestbombdir (_point pos, int dir, int range); + extern int ai_bombpoints (_point pos, int range); +--- a/include/sysfunc.h ++++ b/include/sysfunc.h +@@ -34,8 +34,8 @@ + extern int s_countbits (int nbomb, int nr); + extern char* getfilename(char* path); + +-extern inline Sint16 s_swap16 (Sint16 i); +-extern inline Sint32 s_swap32 (Sint32 i); ++extern Sint16 s_swap16 (Sint16 i); ++extern Sint32 s_swap32 (Sint32 i); + + extern _direntry *s_getdir (char *path); + extern _direntry *s_dirfilter (_direntry *dirstart, signed char dirflags); +@@ -48,13 +48,7 @@ + #define sqrtf(__x) ((float)sqrt((double)__x)) + #endif + +-#ifndef HAVE_RINTF +- #ifndef HAVE_RINT +- extern inline float rintf (float f); +- #else +- #define rintf(__x) ((float)rint(double)__x) +- #endif +-#endif ++ + + #ifndef HAVE_FLOORF + #define floorf(__x) ((float)floor((double)__x)) +@@ -68,7 +62,8 @@ + #define vsnprintf _vsnprintf + #endif + +-extern inline void s_calctimesync (); ++extern void s_calctimesync (); ++ + extern void rect_clipping (SDL_Rect *src, SDL_Rect *dest, SDL_Rect *window, SDL_Rect *csrc, SDL_Rect *cdest); + extern void charlist_fillarraypointer (_charlist *list, int c); + extern _charlist *charlist_findtext (_charlist *list, char *text); +--- a/src/bomb.c ++++ b/src/bomb.c +@@ -6,6 +6,8 @@ + #include "bomb.h" + #include + ++extern inline void bomb_action (_bomb * bomb); ++ + void draw_bomb (_bomb * bomb) { + SDL_Rect src, dest; + int x = floorf (bomb->oldpos.x), y = floorf (bomb->oldpos.y); +--- a/src/gfx.c ++++ b/src/gfx.c +@@ -10,6 +10,8 @@ + static void gfx_load_menusmall_players (); + static void gfx_load_fieldtype_menu (); + ++ ++ + /* + * count all playergfx + */ +--- a/src/menu.c ++++ b/src/menu.c +@@ -11,6 +11,8 @@ + #define MENU_MESSAGES_MAXLINES 5 + #define MENU_MESSAGES_MAXLINELEN 50 + ++extern inline void menu_draw_menuitem (_menuitem *m); ++extern inline void menu_reload_menuitem (_menuitem *m); + + SDL_Surface *menuimages[9]; // holds the gfx + SDL_Surface *menulistimages[2][9]; // holds the gfx for the lists +--- a/src/player.c ++++ b/src/player.c +@@ -11,6 +11,8 @@ + #include "bomb.h" + #include "menu.h" + ++ ++ + void + draw_player (_player * player) + { +--- a/src/single.c ++++ b/src/single.c +@@ -7,6 +7,9 @@ + #include "player.h" + #include "single.h" + ++extern inline int ai_invertdir (int dir); ++extern inline int ai_checkpos (_player * pl, _point * pos); ++ + /* start a single player game and prepare everything for the game */ + void + single_game_new () +@@ -476,7 +479,7 @@ + }; + + +-inline int ++int + ai_checknewpos (_point pos, int d) + { + _point m; +--- a/include/gfx.h ++++ b/include/gfx.h +@@ -104,8 +104,8 @@ + extern void gfx_blitdraw (); + extern void gfx_blit (SDL_Surface *srci, SDL_Rect *srcr, SDL_Surface *desti, SDL_Rect *destr, int y); + extern void gfx_blitsort (); +-extern inline void gfx_blitsortclear (); +-extern inline void gfx_blitupdaterectclear (); ++extern void gfx_blitsortclear (); ++extern void gfx_blitupdaterectclear (); + extern void gfx_blitupdaterectdraw (); + extern void gfx_blitupdaterectadd (SDL_Rect *rect); + diff -Nru bomberclone-0.11.9/debian/patches/07_fixSpelling.patch bomberclone-0.11.9/debian/patches/07_fixSpelling.patch --- bomberclone-0.11.9/debian/patches/07_fixSpelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/07_fixSpelling.patch 2015-07-02 09:27:27.000000000 +0000 @@ -0,0 +1,15 @@ +From: Peter Spiess-Knafl +Subject: Fix spelling error: Programm -> Programm +Forwarded: via private mail to steffen@bomberclone.de + +--- a/src/configuration.c ++++ b/src/configuration.c +@@ -734,7 +734,7 @@ + printf (" Bug Report to :\n"); + printf (" http://sourceforge.net/tracker/?group_id=79449&atid=556629\n"); + printf (" Other Comments: steffen@bomberclone.de\n"); +- printf ("\nProgramm options:\n"); ++ printf ("\nProgram options:\n"); + printf (" -name PLAYERNAME - set the Playername\n"); + printf (" -name2 PLAYERNAME - set the Playername for the second player\n"); + printf (" -gamename GAMENAME - set the name of the game\n"); diff -Nru bomberclone-0.11.9/debian/patches/series bomberclone-0.11.9/debian/patches/series --- bomberclone-0.11.9/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ bomberclone-0.11.9/debian/patches/series 2015-07-02 09:27:27.000000000 +0000 @@ -0,0 +1,7 @@ +01_cementery.diff +02_enter.diff +03_sigsegv.diff +04_no-add-needed.diff +05_fix_gcc4.6_warning.diff +06_gcc5.patch +07_fixSpelling.patch diff -Nru bomberclone-0.11.9/debian/rules bomberclone-0.11.9/debian/rules --- bomberclone-0.11.9/debian/rules 2015-07-02 21:27:20.000000000 +0000 +++ bomberclone-0.11.9/debian/rules 2015-07-02 09:27:27.000000000 +0000 @@ -1,19 +1,21 @@ #!/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 +%: + dh $@ --with autoreconf -DEB_CONFIGURE_EXTRA_FLAGS += \ +override_dh_auto_configure: + dh_auto_configure -- \ --prefix=/usr \ --bindir=/usr/games \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --datadir=/usr/share/games/bomberclone \ -update-config:: +override_dh_auto_build: + dh_auto_build docbook-to-man debian/bomberclone.sgml > debian/bomberclone.6 -clean:: +override_dh_auto_clean: + dh_auto_clean rm -f debian/bomberclone.6 diff -Nru bomberclone-0.11.9/debian/source/format bomberclone-0.11.9/debian/source/format --- bomberclone-0.11.9/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ bomberclone-0.11.9/debian/source/format 2015-07-02 09:27:27.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)