diff -Nru abe-1.1+dfsg/debian/abe.6 abe-1.1+dfsg/debian/abe.6 --- abe-1.1+dfsg/debian/abe.6 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/abe.6 2016-06-11 09:59:04.000000000 +0000 @@ -43,7 +43,7 @@ .SH DESCRIPTION .\" Putting a newline after each sentence can generate better output. -An Adventure Game. +An Adventure Game. Abe's Amazing Adventure! A Side Scrolling Game. @@ -59,19 +59,19 @@ .B -e | --editor Skip the splash screen and run the editor. -.B -i | --intro +.B -i | --intro Edit intro map. -.B -g | --game +.B -g | --game Skip the splash screen and run the game. -.B -t | --test +.B -t | --test Test video modes only. -.B -s | --system +.B -s | --system Use system memory instead of video(default) memory. -.B --size # +.B --size # Use this width/height for the video mode. Modes: 0: 320/ 200 (1.60) @@ -87,13 +87,13 @@ 10: 1440/ 900 (1.60) 11: 1400/1050 (1.33) -.B -b | --bpp # +.B -b | --bpp # Use this bpp for the video mode. -.B --nosound +.B --nosound Don't use sound. -.B -? | -h | --help +.B -? | -h | --help Show the help message. .SH AUTHOR @@ -106,8 +106,8 @@ .SH HISTORY The game is intended to show young people all the cool games they missed. -.SH LICENCE -This is free software; you can redistribute it and/or modify -it under the terms specified in the GNU Public Licence (GPL). +.SH LICENCE +This is free software; you can redistribute it and/or modify +it under the terms specified in the GNU General Public Licence 2 or later (GPL). diff -Nru abe-1.1+dfsg/debian/abe-data.install abe-1.1+dfsg/debian/abe-data.install --- abe-1.1+dfsg/debian/abe-data.install 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/abe-data.install 2016-06-11 09:59:04.000000000 +0000 @@ -1,3 +1,5 @@ +abe.png usr/share/pixmaps +abe.xpm usr/share/pixmaps images usr/share/games/abe/ maps usr/share/games/abe/ sounds usr/share/games/abe/ diff -Nru abe-1.1+dfsg/debian/abe.desktop abe-1.1+dfsg/debian/abe.desktop --- abe-1.1+dfsg/debian/abe.desktop 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/abe.desktop 2016-06-11 09:59:04.000000000 +0000 @@ -1,11 +1,10 @@ [Desktop Entry] Version=1.0 Type=Application -Encoding=UTF-8 Name=Abe's Amazing Adventure Comment=Side-scrolling game -TryExec=/usr/games/abe -Exec=/usr/games/abe +Comment[de]=ein sich seitwärts bewegendes Abenteuerspiel +Exec=abe +Icon=abe Categories=Game;AdventureGame; -Icon=/usr/share/pixmaps/abe.xpm -MimeType= +Keywords=side-scrolling;adventure;pyramid;singleplayer; diff -Nru abe-1.1+dfsg/debian/abe.install abe-1.1+dfsg/debian/abe.install --- abe-1.1+dfsg/debian/abe.install 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/abe.install 2016-06-11 09:59:04.000000000 +0000 @@ -1,3 +1,2 @@ -debian/tmp/usr/games/abe usr/games/ -abe.xpm usr/share/pixmaps/ debian/abe.desktop usr/share/applications/ +usr/games diff -Nru abe-1.1+dfsg/debian/changelog abe-1.1+dfsg/debian/changelog --- abe-1.1+dfsg/debian/changelog 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/changelog 2016-06-11 09:59:04.000000000 +0000 @@ -1,3 +1,30 @@ +abe (1.1+dfsg-2) unstable; urgency=medium + + * New maintainer Debian Games Team. Add myself as Uploader. (Closes: #826913) + * wrap-and-sort -sab. + * Declare compliance with Debian Policy 3.9.8. + * Switch to source format 3.0 (quilt). + * Use compat level 9 and require debhelper >= 9. + * debian/watch: Use version=4. + * Update menu file. Use the absolute icon path to display the menu icon. + Update abe.desktop and create a valid desktop file. Add a comment in + German and keywords. (Closes: #737783) + * Move the package to Git. + * Remove superfluous ${shlibs:Depends} substvar from abe-data. + * Switch from cdbs to dh sequencer. + * Build with autoreconf. + * Install abe.png icon to /usr/share/pixmaps. + Move abe.xpm icon into abe-data package. Add Breaks and Replaces. + * Clarify license in abe.6. + * Rebase all patches and change the file extension from diff to patch. + * Update debian/copyright to copyright format 1.0. + * Move imagemagick to Build-Depends-Indep. + * Move copyright comment into README.source. + * Add format-security.patch and fix the FTBFS due to enabled hardening + build flags. + + -- Markus Koschany Sat, 11 Jun 2016 11:29:15 +0200 + abe (1.1+dfsg-1) unstable; urgency=low * Repackaged upstream tarball to remove libraries for Win32 in binary form diff -Nru abe-1.1+dfsg/debian/compat abe-1.1+dfsg/debian/compat --- abe-1.1+dfsg/debian/compat 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/compat 2016-06-11 09:59:04.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru abe-1.1+dfsg/debian/control abe-1.1+dfsg/debian/control --- abe-1.1+dfsg/debian/control 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/control 2016-06-11 09:59:04.000000000 +0000 @@ -1,23 +1,44 @@ Source: abe Section: games Priority: optional -Maintainer: Bart Martens -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, imagemagick, libxi-dev, libxmu-dev -Standards-Version: 3.8.0 +Maintainer: Debian Games Team +Uploaders: + Markus Koschany +Build-Depends: + debhelper (>= 9), + dh-autoreconf, + libsdl-image1.2-dev, + libsdl-mixer1.2-dev, + libsdl1.2-dev, + libxi-dev, + libxmu-dev +Build-Depends-Indep: + imagemagick +Standards-Version: 3.9.8 Homepage: http://abe.sourceforge.net/ +Vcs-Git: https://anonscm.debian.org/git/pkg-games/abe.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/abe.git Package: abe Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, abe-data (= ${source:Version}) -Description: Side-scrolling game named "Abe's Amazing Adventure" +Depends: + abe-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: side-scrolling game named "Abe's Amazing Adventure" A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in the style of similar games for the Commodore+4. The game is intended to show young people all the cool games they missed. Package: abe-data Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Side-scrolling game named "Abe's Amazing Adventure" +Breaks: + abe (<< 1.1+dfsg-2) +Replaces: + abe (<< 1.1+dfsg-2) +Depends: + ${misc:Depends} +Description: side-scrolling game named "Abe's Amazing Adventure" -- data A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in the style of similar games for the Commodore+4. The game is intended to show young people all the cool games they missed. diff -Nru abe-1.1+dfsg/debian/copyright abe-1.1+dfsg/debian/copyright --- abe-1.1+dfsg/debian/copyright 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/copyright 2016-06-11 09:59:04.000000000 +0000 @@ -1,55 +1,32 @@ -This package was debianized by Bart Martens on -Tue, 25 Dec 2007 10:15:27 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: http://abe.sourceforge.net/ -It was downloaded from: +Files: * +Copyright: 2002-2005, Gabor Torok + 2002-2005, Pedro Izecksohn + 2002-2005, Alex Clarck +License: GPL-2+ + +Files: debian/* +Copyright: 2007-2012, Bart Martens + 2016, Markus Koschany +License: GPL-2+ + +License: GPL-2+ + 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 2 can be found in `/usr/share/common-licenses/GPL-2'. - http://abe.sourceforge.net/ - -How the file abe_1.1+dfsg.orig.tar.gz was created : - - md5sum abe_1.1.orig.tar.gz abe-1.1.tar.gz - 5537920e1746708e1a631d84d3500f5c abe_1.1.orig.tar.gz - 5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz - tar xzf abe_1.1.orig.tar.gz - rm abe-1.1/SDL.dll - rm abe-1.1/SDL_mixer.dll - mv abe-1.1 abe-1.1.orig - tar cf abe_1.1+dfsg.orig.tar abe-1.1.orig - gzip -9 abe_1.1+dfsg.orig.tar - md5sum abe_1.1+dfsg.orig.tar.gz - 0dbea531d34b078af0529f297df3eb6f abe_1.1+dfsg.orig.tar.gz - -Upstream authors: - - Gabor Torok - Pedro Izecksohn - Alex Clarck - -Copyright: - - Copyright (C) 2002-2005, Gabor Torok - Copyright (C) 2002-2005, Pedro Izecksohn - Copyright (C) 2002-2005, Alex Clarck - -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'. - -The Debian packaging is -Copyright (C) 2007-2012, Bart Martens -and is licensed under the GPL, see above. diff -Nru abe-1.1+dfsg/debian/menu abe-1.1+dfsg/debian/menu --- abe-1.1+dfsg/debian/menu 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/menu 2016-06-11 09:59:04.000000000 +0000 @@ -1,3 +1,5 @@ -?package(abe):needs="X11" section="Games/Adventure"\ - icon="abe.xpm"\ - title="Abe's Amazing Adventure" command="/usr/games/abe" +?package(abe):needs="X11" \ + section="Games/Adventure" \ + icon="/usr/share/pixmaps/abe.xpm" \ + title="Abe's Amazing Adventure" \ + command="/usr/games/abe" diff -Nru abe-1.1+dfsg/debian/patches/01_resolutions.diff abe-1.1+dfsg/debian/patches/01_resolutions.diff --- abe-1.1+dfsg/debian/patches/01_resolutions.diff 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/01_resolutions.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ ---- ../orig/abe-1.1/src/Main.c 2005-03-05 17:20:04.000000000 +0100 -+++ src/Main.c 2007-12-25 12:04:02.000000000 +0100 -@@ -84,7 +84,9 @@ - main(int argc, char *argv[]) - { - Uint32 flags = SDL_DOUBLEBUF; -- int i; -+ int i, j; -+ static int available_resolution_width [] = { 320, 320, 640, 640, 800, 1024, 1280, 1600, 1280, 1280, 1440, 1400, 0 }; -+ static int available_resolution_height[] = { 200, 240, 400, 480, 600, 768, 1024, 1200, 768, 800, 900, 1050, 0 }; - int w, h, bpp, n; - int hw_mem = 1; - int intro = 0; -@@ -129,43 +131,13 @@ - runmode = RUNMODE_GAME; - } else if(!strcmp(argv[i], "--size") && i < argc - 1) { - n = atoi(argv[i + 1]); -- switch (n) { -- case 0: -- w = 320; -- h = 200; -- break; -- case 1: -- w = 320; -- h = 240; -- break; -- case 2: -- w = 640; -- h = 400; -- break; -- case 3: -- w = 640; -- h = 480; -- break; -- case 4: -- w = 800; -- h = 600; -- break; -- case 5: -- w = 1024; -- h = 768; -- break; -- case 6: -- w = 1280; -- h = 1024; -- break; -- case 7: -- w = 1600; -- h = 1200; -- break; -- default: -- w = 640; -- h = 480; -- } -+ for( j = 0 ; available_resolution_width[j] != 0 ; j++ ) -+ if( j == n ) -+ { -+ w = available_resolution_width[j]; -+ h = available_resolution_height[j]; -+ break; -+ } - } else if((!strcmp(argv[i], "--bpp") || !strcmp(argv[i], "-b")) - && i < argc - 1) { - n = atoi(argv[i + 1]); -@@ -191,7 +163,11 @@ - printf - ("--size # Use this width/height for the video mode.\n"); - printf -- ("\tModes: 0-320/200 1-320/240 2-640/400 3-640/480 4-800/600 5-1024/768 6-1280/1024 7-1600/1200\n"); -+ ("\tModes:\n"); -+ for( j = 0 ; available_resolution_width[j] != 0 ; j++ ) -+ printf( "\t %2d: %4d/%4d (%1.2f)\n", j, -+ available_resolution_width[j], available_resolution_height[j], -+ (float)available_resolution_width[j] / (float)available_resolution_height[j] ); - printf("-b --bpp # Use this bpp for the video mode.\n"); - printf("--nosound Don't use sound.\n"); - printf("-? -h --help Show this help message.\n"); diff -Nru abe-1.1+dfsg/debian/patches/01-resolutions.patch abe-1.1+dfsg/debian/patches/01-resolutions.patch --- abe-1.1+dfsg/debian/patches/01-resolutions.patch 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/01-resolutions.patch 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,87 @@ +From: Bart Martens +Date: Sat, 11 Jun 2016 10:52:04 +0200 +Subject: 01 resolutions + +--- + src/Main.c | 54 +++++++++++++++--------------------------------------- + 1 file changed, 15 insertions(+), 39 deletions(-) + +diff --git a/src/Main.c b/src/Main.c +index 2520856..894c519 100644 +--- a/src/Main.c ++++ b/src/Main.c +@@ -84,7 +84,9 @@ int + main(int argc, char *argv[]) + { + Uint32 flags = SDL_DOUBLEBUF; +- int i; ++ int i, j; ++ static int available_resolution_width [] = { 320, 320, 640, 640, 800, 1024, 1280, 1600, 1280, 1280, 1440, 1400, 0 }; ++ static int available_resolution_height[] = { 200, 240, 400, 480, 600, 768, 1024, 1200, 768, 800, 900, 1050, 0 }; + int w, h, bpp, n; + int hw_mem = 1; + int intro = 0; +@@ -129,43 +131,13 @@ main(int argc, char *argv[]) + runmode = RUNMODE_GAME; + } else if(!strcmp(argv[i], "--size") && i < argc - 1) { + n = atoi(argv[i + 1]); +- switch (n) { +- case 0: +- w = 320; +- h = 200; +- break; +- case 1: +- w = 320; +- h = 240; +- break; +- case 2: +- w = 640; +- h = 400; +- break; +- case 3: +- w = 640; +- h = 480; +- break; +- case 4: +- w = 800; +- h = 600; +- break; +- case 5: +- w = 1024; +- h = 768; +- break; +- case 6: +- w = 1280; +- h = 1024; +- break; +- case 7: +- w = 1600; +- h = 1200; +- break; +- default: +- w = 640; +- h = 480; +- } ++ for( j = 0 ; available_resolution_width[j] != 0 ; j++ ) ++ if( j == n ) ++ { ++ w = available_resolution_width[j]; ++ h = available_resolution_height[j]; ++ break; ++ } + } else if((!strcmp(argv[i], "--bpp") || !strcmp(argv[i], "-b")) + && i < argc - 1) { + n = atoi(argv[i + 1]); +@@ -191,7 +163,11 @@ main(int argc, char *argv[]) + printf + ("--size # Use this width/height for the video mode.\n"); + printf +- ("\tModes: 0-320/200 1-320/240 2-640/400 3-640/480 4-800/600 5-1024/768 6-1280/1024 7-1600/1200\n"); ++ ("\tModes:\n"); ++ for( j = 0 ; available_resolution_width[j] != 0 ; j++ ) ++ printf( "\t %2d: %4d/%4d (%1.2f)\n", j, ++ available_resolution_width[j], available_resolution_height[j], ++ (float)available_resolution_width[j] / (float)available_resolution_height[j] ); + printf("-b --bpp # Use this bpp for the video mode.\n"); + printf("--nosound Don't use sound.\n"); + printf("-? -h --help Show this help message.\n"); diff -Nru abe-1.1+dfsg/debian/patches/02_enter_keys.diff abe-1.1+dfsg/debian/patches/02_enter_keys.diff --- abe-1.1+dfsg/debian/patches/02_enter_keys.diff 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/02_enter_keys.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -Fixes the return/enter key on some keyboards. - - -diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Editor.c ./src/Editor.c ---- ../orig/abe-1.1/src/Editor.c 2005-03-05 17:20:04.000000000 +0100 -+++ ./src/Editor.c 2007-12-26 11:52:21.000000000 +0100 -@@ -298,6 +298,7 @@ - cursor.dir = DIR_NONE; - map.redraw = 1; - break; -+ case SDLK_KP_ENTER: - case SDLK_RETURN: - setImage(edit_panel.level, edit_panel.image_index); - break; -diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Game.c ./src/Game.c ---- ../orig/abe-1.1/src/Game.c 2005-03-05 17:20:04.000000000 +0100 -+++ ./src/Game.c 2007-12-26 11:51:59.000000000 +0100 -@@ -386,6 +386,7 @@ - game.keys++; - break; - #endif -+ case SDLK_KP_ENTER: - case SDLK_RETURN: - if(!game.end_game) { - if(!game.balloonTimer && game.balloons) { -diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Icons.c ./src/Icons.c ---- ../orig/abe-1.1/src/Icons.c 2005-03-05 17:20:04.000000000 +0100 -+++ ./src/Icons.c 2007-12-26 11:52:55.000000000 +0100 -@@ -99,6 +99,7 @@ - icon_selection = -1; - goto escape; - case SDLK_SPACE: -+ case SDLK_KP_ENTER: - case SDLK_RETURN: - goto escape; - case SDLK_LEFT: -diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Splash.c ./src/Splash.c ---- ../orig/abe-1.1/src/Splash.c 2005-03-05 17:20:04.000000000 +0100 -+++ ./src/Splash.c 2007-12-26 11:52:38.000000000 +0100 -@@ -40,6 +40,7 @@ - if(menu_y < 0) - menu_y = FONT_HEIGHT * (GOD_MODE ? 4 : 3); - break; -+ case SDLK_KP_ENTER: - case SDLK_RETURN: - case SDLK_SPACE: - map.quit = 1; diff -Nru abe-1.1+dfsg/debian/patches/02-enter-keys.patch abe-1.1+dfsg/debian/patches/02-enter-keys.patch --- abe-1.1+dfsg/debian/patches/02-enter-keys.patch 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/02-enter-keys.patch 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,60 @@ +From: Bart Martens +Date: Sat, 11 Jun 2016 10:52:24 +0200 +Subject: 02 enter keys + +Fixes the return/enter key on some keyboards +--- + src/Editor.c | 1 + + src/Game.c | 1 + + src/Icons.c | 1 + + src/Splash.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/src/Editor.c b/src/Editor.c +index 845e35b..1a73d43 100644 +--- a/src/Editor.c ++++ b/src/Editor.c +@@ -298,6 +298,7 @@ editorMainLoop(SDL_Event * event) + cursor.dir = DIR_NONE; + map.redraw = 1; + break; ++ case SDLK_KP_ENTER: + case SDLK_RETURN: + setImage(edit_panel.level, edit_panel.image_index); + break; +diff --git a/src/Game.c b/src/Game.c +index 8d9532e..a5cbcb1 100644 +--- a/src/Game.c ++++ b/src/Game.c +@@ -386,6 +386,7 @@ gameMainLoop(SDL_Event * event) + game.keys++; + break; + #endif ++ case SDLK_KP_ENTER: + case SDLK_RETURN: + if(!game.end_game) { + if(!game.balloonTimer && game.balloons) { +diff --git a/src/Icons.c b/src/Icons.c +index 29f7303..9eaea45 100644 +--- a/src/Icons.c ++++ b/src/Icons.c +@@ -99,6 +99,7 @@ selectIcon() + icon_selection = -1; + goto escape; + case SDLK_SPACE: ++ case SDLK_KP_ENTER: + case SDLK_RETURN: + goto escape; + case SDLK_LEFT: +diff --git a/src/Splash.c b/src/Splash.c +index 6b3e7d1..d6605ac 100644 +--- a/src/Splash.c ++++ b/src/Splash.c +@@ -40,6 +40,7 @@ splashMainLoop(SDL_Event * event) + if(menu_y < 0) + menu_y = FONT_HEIGHT * (GOD_MODE ? 4 : 3); + break; ++ case SDLK_KP_ENTER: + case SDLK_RETURN: + case SDLK_SPACE: + map.quit = 1; diff -Nru abe-1.1+dfsg/debian/patches/03_truncate_menu.diff abe-1.1+dfsg/debian/patches/03_truncate_menu.diff --- abe-1.1+dfsg/debian/patches/03_truncate_menu.diff 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/03_truncate_menu.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- ../orig/abe-1.1/src/Menu.c 2005-03-05 17:20:04.000000000 +0100 -+++ src/Menu.c 2008-01-24 08:05:59.000000000 +0100 -@@ -21,6 +21,7 @@ - {"audio", 0, {""}, 0}, - {"sound", 2, {"on", "off"}, 0}, - {"music", 2, {"on", "off"}, 0}, -+ {"", 0, {""}, 0}, // truncates the menu here - {"video", 0, {""}, 0}, - {"full screen", 2, {"on", "off"}, 0}, - {"background", 2, {"on", "off"}, 0}, diff -Nru abe-1.1+dfsg/debian/patches/03-truncate-menu.patch abe-1.1+dfsg/debian/patches/03-truncate-menu.patch --- abe-1.1+dfsg/debian/patches/03-truncate-menu.patch 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/03-truncate-menu.patch 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,20 @@ +From: Bart Martens +Date: Sat, 11 Jun 2016 10:52:47 +0200 +Subject: 03 truncate menu + +--- + src/Menu.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Menu.c b/src/Menu.c +index 87066cc..7575b37 100644 +--- a/src/Menu.c ++++ b/src/Menu.c +@@ -21,6 +21,7 @@ SettingEntry entries[] = { + {"audio", 0, {""}, 0}, + {"sound", 2, {"on", "off"}, 0}, + {"music", 2, {"on", "off"}, 0}, ++ {"", 0, {""}, 0}, // truncates the menu here + {"video", 0, {""}, 0}, + {"full screen", 2, {"on", "off"}, 0}, + {"background", 2, {"on", "off"}, 0}, diff -Nru abe-1.1+dfsg/debian/patches/04_default_reso.diff abe-1.1+dfsg/debian/patches/04_default_reso.diff --- abe-1.1+dfsg/debian/patches/04_default_reso.diff 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/04_default_reso.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ ---- ../orig/abe-1.1/src/Main.c 2005-03-05 17:20:04.000000000 +0100 -+++ src/Main.c 2008-01-24 11:37:23.000000000 +0100 -@@ -113,6 +113,16 @@ - - atexit(SDL_Quit); - -+ SDL_VideoInfo *vid_info; -+ vid_info = (SDL_VideoInfo*) SDL_GetVideoInfo (); -+ if( vid_info ) -+ if( vid_info->current_w == 1440 && vid_info->current_h ==900 -+ || vid_info->current_w == 1400 && vid_info->current_h ==1050 ) -+ { -+ w = vid_info->current_w; -+ h = vid_info->current_h; -+ } -+ - for(i = 0; i < argc; i++) { - if(!strcmp(argv[i], "--window")) { - mainstruct.full_screen = 0; diff -Nru abe-1.1+dfsg/debian/patches/04-default-reso.patch abe-1.1+dfsg/debian/patches/04-default-reso.patch --- abe-1.1+dfsg/debian/patches/04-default-reso.patch 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/04-default-reso.patch 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,29 @@ +From: Bart Martens +Date: Sat, 11 Jun 2016 10:53:49 +0200 +Subject: 04 default reso + +--- + src/Main.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/Main.c b/src/Main.c +index 894c519..5e06db3 100644 +--- a/src/Main.c ++++ b/src/Main.c +@@ -115,6 +115,16 @@ main(int argc, char *argv[]) + + atexit(SDL_Quit); + ++ SDL_VideoInfo *vid_info; ++ vid_info = (SDL_VideoInfo*) SDL_GetVideoInfo (); ++ if( vid_info ) ++ if( vid_info->current_w == 1440 && vid_info->current_h ==900 ++ || vid_info->current_w == 1400 && vid_info->current_h ==1050 ) ++ { ++ w = vid_info->current_w; ++ h = vid_info->current_h; ++ } ++ + for(i = 0; i < argc; i++) { + if(!strcmp(argv[i], "--window")) { + mainstruct.full_screen = 0; diff -Nru abe-1.1+dfsg/debian/patches/05_cheat.diff abe-1.1+dfsg/debian/patches/05_cheat.diff --- abe-1.1+dfsg/debian/patches/05_cheat.diff 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/05_cheat.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ ---- ../orig/abe-1.1/src/Game.c 2005-03-05 17:20:04.000000000 +0100 -+++ src/Game.c 2008-01-24 10:55:01.000000000 +0100 -@@ -3,6 +3,7 @@ - #include - - Game game; -+static int cheat = 0; // 0=no, 1=yes - - // path_sprintf should not be used by other .c files, as it does not fit for them. - static void -@@ -381,6 +382,17 @@ - case SDLK_d: - debugMonsters(); - break; -+ case SDLK_c: -+ if( event->key.keysym.mod & ( KMOD_CTRL | KMOD_SHIFT | KMOD_ALT ) && getenv( "ABE_IS_CHEATING" ) ) -+ cheat = 1 - cheat; -+ if( cheat ) -+ { -+ game.lives = MAX_LIVES; -+ game.keys = MAX_KEYS; -+ game.balloons = MAX_BALLOONS; -+ game.health = MAX_HEALTH; -+ } -+ break; - #if GOD_MODE - case SDLK_k: - game.keys++; -@@ -390,6 +402,7 @@ - if(!game.end_game) { - if(!game.balloonTimer && game.balloons) { - playSound(BUBBLE_SOUND); -+ if( ! cheat ) - game.balloons--; - game.balloonTimer = BALLOON_RIDE_INTERVAL; - map.gravity = 0; -@@ -456,9 +469,11 @@ - - if(live) { - showMapStatus(live->monster->name); -+ if( ! cheat ) - game.health -= (live->monster->damage * (game.difficoulty + 1)); - } else { - showMapStatus("drowning!"); -+ if( ! cheat ) - game.health--; // water damage - show_effect = !(game.tick % 40); - } -@@ -489,6 +504,7 @@ - if(game.god_mode) - return; - -+ if( ! cheat ) - game.lives--; - - // Flash player. Don't move monsters during this. -@@ -691,6 +707,7 @@ - EMPTY_MAP; - map.image_index[LEVEL_FORE][key.pos_x + (key.pos_y * map.w)] = - img_door2; -+ if( ! cheat ) - game.keys--; - map.redraw = 1; - // always return 0 (block) so we don't fall into a door and get stuck there... (was a nasty bug) -@@ -771,7 +788,7 @@ - game.player_start_y = 28; - } - -- game.lives = 5; -+ game.lives = MAX_LIVES; - game.score = 0; - game.keys = 0; - game.balloons = 0; ---- ../orig/abe-1.1/src/Game.h 2005-03-05 17:20:04.000000000 +0100 -+++ src/Game.h 2008-01-24 10:45:45.000000000 +0100 -@@ -20,6 +20,7 @@ - - #define SPRING_JUMP 30 - -+#define MAX_LIVES 5 - #define MAX_HEALTH 100 - - // don't hold more than these... mainly b/c the gui can't handle it diff -Nru abe-1.1+dfsg/debian/patches/05-cheat.patch abe-1.1+dfsg/debian/patches/05-cheat.patch --- abe-1.1+dfsg/debian/patches/05-cheat.patch 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/05-cheat.patch 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,96 @@ +From: Bart Martens +Date: Sat, 11 Jun 2016 10:54:35 +0200 +Subject: 05 cheat + +--- + src/Game.c | 19 ++++++++++++++++++- + src/Game.h | 1 + + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/src/Game.c b/src/Game.c +index a5cbcb1..74002c7 100644 +--- a/src/Game.c ++++ b/src/Game.c +@@ -3,6 +3,7 @@ + #include + + Game game; ++static int cheat = 0; // 0=no, 1=yes + + // path_sprintf should not be used by other .c files, as it does not fit for them. + static void +@@ -381,6 +382,17 @@ gameMainLoop(SDL_Event * event) + case SDLK_d: + debugMonsters(); + break; ++ case SDLK_c: ++ if( event->key.keysym.mod & ( KMOD_CTRL | KMOD_SHIFT | KMOD_ALT ) && getenv( "ABE_IS_CHEATING" ) ) ++ cheat = 1 - cheat; ++ if( cheat ) ++ { ++ game.lives = MAX_LIVES; ++ game.keys = MAX_KEYS; ++ game.balloons = MAX_BALLOONS; ++ game.health = MAX_HEALTH; ++ } ++ break; + #if GOD_MODE + case SDLK_k: + game.keys++; +@@ -391,6 +403,7 @@ gameMainLoop(SDL_Event * event) + if(!game.end_game) { + if(!game.balloonTimer && game.balloons) { + playSound(BUBBLE_SOUND); ++ if( ! cheat ) + game.balloons--; + game.balloonTimer = BALLOON_RIDE_INTERVAL; + map.gravity = 0; +@@ -457,9 +470,11 @@ handleDeath(LiveMonster * live) + + if(live) { + showMapStatus(live->monster->name); ++ if( ! cheat ) + game.health -= (live->monster->damage * (game.difficoulty + 1)); + } else { + showMapStatus("drowning!"); ++ if( ! cheat ) + game.health--; // water damage + show_effect = !(game.tick % 40); + } +@@ -490,6 +505,7 @@ handleDeath(LiveMonster * live) + if(game.god_mode) + return; + ++ if( ! cheat ) + game.lives--; + + // Flash player. Don't move monsters during this. +@@ -692,6 +708,7 @@ detectCollision(int dir) + EMPTY_MAP; + map.image_index[LEVEL_FORE][key.pos_x + (key.pos_y * map.w)] = + img_door2; ++ if( ! cheat ) + game.keys--; + map.redraw = 1; + // always return 0 (block) so we don't fall into a door and get stuck there... (was a nasty bug) +@@ -772,7 +789,7 @@ runMap() + game.player_start_y = 28; + } + +- game.lives = 5; ++ game.lives = MAX_LIVES; + game.score = 0; + game.keys = 0; + game.balloons = 0; +diff --git a/src/Game.h b/src/Game.h +index aa61e51..84c1b03 100644 +--- a/src/Game.h ++++ b/src/Game.h +@@ -20,6 +20,7 @@ + + #define SPRING_JUMP 30 + ++#define MAX_LIVES 5 + #define MAX_HEALTH 100 + + // don't hold more than these... mainly b/c the gui can't handle it diff -Nru abe-1.1+dfsg/debian/patches/06_hardening-format-security.diff abe-1.1+dfsg/debian/patches/06_hardening-format-security.diff --- abe-1.1+dfsg/debian/patches/06_hardening-format-security.diff 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/06_hardening-format-security.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Game.c ./src/Game.c ---- ../orig/abe-1.1/src/Game.c 2005-03-05 17:20:04.000000000 +0100 -+++ ./src/Game.c 2011-09-30 07:48:02.000000000 +0200 -@@ -18,7 +18,7 @@ - len = strlen(path); - - if(1 == version) { -- sprintf(path + len, formatted_name); -+ sprintf(path + len, "%s", formatted_name); - } else { - sprintf(path + len, formatted_name, version); - } diff -Nru abe-1.1+dfsg/debian/patches/format-security.patch abe-1.1+dfsg/debian/patches/format-security.patch --- abe-1.1+dfsg/debian/patches/format-security.patch 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/format-security.patch 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,24 @@ +From: Markus Koschany +Date: Sat, 11 Jun 2016 11:53:59 +0200 +Subject: format security + +--- + src/Game.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Game.c b/src/Game.c +index 74002c7..8152309 100644 +--- a/src/Game.c ++++ b/src/Game.c +@@ -19,9 +19,9 @@ path_sprintf(char *path, char *formatted_name, int version) + len = strlen(path); + + if(1 == version) { +- sprintf(path + len, formatted_name); ++ sprintf(path + len, "%s", formatted_name); + } else { +- sprintf(path + len, formatted_name, version); ++ sprintf(path + len, "%s", formatted_name, version); + } + + } diff -Nru abe-1.1+dfsg/debian/patches/series abe-1.1+dfsg/debian/patches/series --- abe-1.1+dfsg/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/patches/series 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,6 @@ +01-resolutions.patch +02-enter-keys.patch +03-truncate-menu.patch +04-default-reso.patch +05-cheat.patch +format-security.patch diff -Nru abe-1.1+dfsg/debian/README.source abe-1.1+dfsg/debian/README.source --- abe-1.1+dfsg/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/README.source 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1,14 @@ +How the file abe_1.1+dfsg.orig.tar.gz was created : +md5sum abe_1.1.orig.tar.gz abe-1.1.tar.gz +5537920e1746708e1a631d84d3500f5c abe_1.1.orig.tar.gz +5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz +tar xzf abe_1.1.orig.tar.gz +rm abe-1.1/SDL.dll +rm abe-1.1/SDL_mixer.dll +mv abe-1.1 abe-1.1.orig +tar cf abe_1.1+dfsg.orig.tar abe-1.1.orig +gzip -9 abe_1.1+dfsg.orig.tar +md5sum abe_1.1+dfsg.orig.tar.gz +0dbea531d34b078af0529f297df3eb6f abe_1.1+dfsg.orig.tar.gz + + diff -Nru abe-1.1+dfsg/debian/rules abe-1.1+dfsg/debian/rules --- abe-1.1+dfsg/debian/rules 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/rules 2016-06-11 09:59:04.000000000 +0000 @@ -1,22 +1,20 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +%: + dh $@ --parallel --with autoreconf -DEB_CONFIGURE_EXTRA_FLAGS += \ - --bindir=/usr/games \ - --with-data-dir=/usr/share/games/abe \ +override_dh_auto_configure: + dh_auto_configure -- \ + --bindir=/usr/games \ + --with-data-dir=/usr/share/games/abe -update-config:: - [ -e config.h.in.d-r-orig ] || cp -p config.h.in config.h.in.d-r-orig +override_dh_auto_build-indep: [ -e tom4.bmp ] || tar xf images/images.tar tom4.bmp + [ -e abe.png ] || convert -resize 64x64 tom4.bmp abe.png [ -e tom4.xpm ] || convert -resize 24x32 tom4.bmp tom4.xpm [ -e abe.xpm ] || sed -e "s/#000000/None/" < tom4.xpm > abe.xpm -reverse-config:: - [ ! -e config.h.in.d-r-orig ] || mv config.h.in.d-r-orig config.h.in - rm -f tom4.bmp tom4.xpm abe.xpm +override_dh_clean: + dh_clean + $(RM) tom4.bmp tom4.xpm abe.xpm abe.png -clean:: - rm -f stamp-h.in diff -Nru abe-1.1+dfsg/debian/source/format abe-1.1+dfsg/debian/source/format --- abe-1.1+dfsg/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ abe-1.1+dfsg/debian/source/format 2016-06-11 09:59:04.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru abe-1.1+dfsg/debian/watch abe-1.1+dfsg/debian/watch --- abe-1.1+dfsg/debian/watch 2016-06-12 00:11:15.000000000 +0000 +++ abe-1.1+dfsg/debian/watch 2016-06-11 09:59:04.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -opts="uversionmangle=s/_/./g;" \ +version=4 +opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,uversionmangle=s/_/./g; \ http://sf.net/abe/abe-(.*)\.tar\.gz