Author: evgeni Date: 2012-05-01 18:18:23 +0000 (Tue, 01 May 2012) New Revision: 13531
Modified: packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch packages/trunk/blocks-of-the-undead/debian/patches/02_accept_mousepress_as_anykey.patch packages/trunk/blocks-of-the-undead/debian/patches/03_dont_fail_if_no_sound_available.patch packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch Log: refresh patches, they had fuzz?! Modified: packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch =================================================================== --- packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch 2012-05-01 18:16:40 UTC (rev 13530) +++ packages/trunk/blocks-of-the-undead/debian/patches/01-sleep_a_bit.patch 2012-05-01 18:18:23 UTC (rev 13531) @@ -4,14 +4,16 @@ Author: Evgeni Golov <[email protected]> Last-Update: 2012-05-01 ---- BlocksOfTheUndead-1.0/TetrisAttack/src/CTetrisGame.cpp 2005-01-17 05:49:02.000000000 +0100 -+++ BlocksOfTheUndead-1.0.patched/TetrisAttack/src/CTetrisGame.cpp 2008-10-18 21:17:42.000000000 +0200 +Index: blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.cpp +=================================================================== +--- blocks-of-the-undead-1.0.orig/TetrisAttack/src/CTetrisGame.cpp 2005-01-17 05:49:02.000000000 +0100 ++++ blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.cpp 2012-05-01 20:13:20.321936666 +0200 @@ -1,3 +1,4 @@ +#include <unistd.h> #include "tetris.h" - CTetrisGame::CTetrisGame(int screenX, int screenY, int bitDepth, bool fullscreen, CTetrisTheme *theme, -@@ -159,6 +159,7 @@ + CTetrisGame::CTetrisGame(int screenX, int screenY, int bitDepth, bool fullscreen, CTetrisTheme *theme, const list<CVector> &fieldOffsets) +@@ -159,6 +160,7 @@ while (!done && SDL_PollEvent(&event)) { handleEvent(event); @@ -19,7 +21,7 @@ } switch(state) -@@ -281,6 +282,7 @@ +@@ -281,6 +283,7 @@ ct = 0; (static_cast<CText*> (*(sprites.begin())))->setText(ss.str()); }*/ Modified: packages/trunk/blocks-of-the-undead/debian/patches/02_accept_mousepress_as_anykey.patch =================================================================== --- packages/trunk/blocks-of-the-undead/debian/patches/02_accept_mousepress_as_anykey.patch 2012-05-01 18:16:40 UTC (rev 13530) +++ packages/trunk/blocks-of-the-undead/debian/patches/02_accept_mousepress_as_anykey.patch 2012-05-01 18:18:23 UTC (rev 13531) @@ -7,9 +7,9 @@ Index: blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.cpp =================================================================== ---- blocks-of-the-undead-1.0.orig/TetrisAttack/src/CTetrisGame.cpp 2012-05-01 20:07:45.031465309 +0200 -+++ blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.cpp 2012-05-01 20:10:13.488559555 +0200 -@@ -362,42 +362,7 @@ +--- blocks-of-the-undead-1.0.orig/TetrisAttack/src/CTetrisGame.cpp 2012-05-01 20:13:20.321936666 +0200 ++++ blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.cpp 2012-05-01 20:13:26.317980862 +0200 +@@ -363,42 +363,7 @@ case Splash: { @@ -53,7 +53,7 @@ }break; default: -@@ -439,12 +404,68 @@ +@@ -440,12 +405,68 @@ case SinglePlayerPuzzle: case SinglePlayer: { @@ -126,7 +126,7 @@ Index: blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.h =================================================================== --- blocks-of-the-undead-1.0.orig/TetrisAttack/src/CTetrisGame.h 2005-01-17 05:49:02.000000000 +0100 -+++ blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.h 2012-05-01 20:07:45.039465363 +0200 ++++ blocks-of-the-undead-1.0/TetrisAttack/src/CTetrisGame.h 2012-05-01 20:13:26.317980862 +0200 @@ -37,6 +37,7 @@ void handleKeypress(const SDL_KeyboardEvent &e); void handleMouseMotion(const SDL_MouseMotionEvent &e); Modified: packages/trunk/blocks-of-the-undead/debian/patches/03_dont_fail_if_no_sound_available.patch =================================================================== --- packages/trunk/blocks-of-the-undead/debian/patches/03_dont_fail_if_no_sound_available.patch 2012-05-01 18:16:40 UTC (rev 13530) +++ packages/trunk/blocks-of-the-undead/debian/patches/03_dont_fail_if_no_sound_available.patch 2012-05-01 18:18:23 UTC (rev 13531) @@ -4,9 +4,10 @@ soundcard or there is no soundcard at all in the machine. Bug-Debian: http://bugs.debian.org/603440 -diff -Nru blocks-of-the-undead-1.0/Oodle/src/CSound.cpp blocks-of-the-undead-1.0.patched/Oodle/src/CSound.cpp ---- blocks-of-the-undead-1.0/Oodle/src/CSound.cpp 2005-01-16 21:20:00.000000000 +0100 -+++ blocks-of-the-undead-1.0.patched/Oodle/src/CSound.cpp 2011-03-28 14:26:25.009659884 +0200 +Index: blocks-of-the-undead-1.0/Oodle/src/CSound.cpp +=================================================================== +--- blocks-of-the-undead-1.0.orig/Oodle/src/CSound.cpp 2005-01-16 21:20:00.000000000 +0100 ++++ blocks-of-the-undead-1.0/Oodle/src/CSound.cpp 2012-05-01 20:13:34.038037764 +0200 @@ -6,13 +6,16 @@ const char* f2 = file.c_str(); data = Mix_LoadWAV( f2 ); @@ -34,9 +35,10 @@ -} \ No newline at end of file +} -diff -Nru blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.cpp blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.cpp ---- blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.cpp 2005-01-16 21:20:00.000000000 +0100 -+++ blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.cpp 2011-03-28 14:24:20.705012382 +0200 +Index: blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.cpp +=================================================================== +--- blocks-of-the-undead-1.0.orig/Oodle/src/CSoundSystem.cpp 2005-01-16 21:20:00.000000000 +0100 ++++ blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.cpp 2012-05-01 20:13:34.038037764 +0200 @@ -3,24 +3,28 @@ CSoundSystem::CSoundSystem(int chunksize, int frequency, int channels, Uint16 format) { @@ -74,9 +76,10 @@ + if (soundAvailable) + Mix_CloseAudio(); +} -diff -Nru blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.h blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.h ---- blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.h 2005-01-17 05:48:19.000000000 +0100 -+++ blocks-of-the-undead-1.0.patched/Oodle/src/CSoundSystem.h 2011-03-28 14:01:00.146914826 +0200 +Index: blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.h +=================================================================== +--- blocks-of-the-undead-1.0.orig/Oodle/src/CSoundSystem.h 2005-01-17 05:48:19.000000000 +0100 ++++ blocks-of-the-undead-1.0/Oodle/src/CSoundSystem.h 2012-05-01 20:13:34.038037764 +0200 @@ -13,7 +13,7 @@ void playSound(CSound &snd) const; void stopSound(const CSound &snd) const; Modified: packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch =================================================================== --- packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch 2012-05-01 18:16:40 UTC (rev 13530) +++ packages/trunk/blocks-of-the-undead/debian/patches/04_configure_vars.patch 2012-05-01 18:18:23 UTC (rev 13531) @@ -1,8 +1,10 @@ Description: correct variable assignment to fix FTBFS Author: Ilya Barygin <[email protected]> ---- blocks-of-the-undead-1.0.orig/configure -+++ blocks-of-the-undead-1.0/configure +Index: blocks-of-the-undead-1.0/configure +=================================================================== +--- blocks-of-the-undead-1.0.orig/configure 2005-06-24 06:17:13.000000000 +0200 ++++ blocks-of-the-undead-1.0/configure 2012-05-01 20:13:38.182068309 +0200 @@ -3860,7 +3860,7 @@ if test "x$no_sdl" = x ; then echo "$as_me:$LINENO: result: yes" >&5 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
