r3672 - packages/trunk/hex-a-hop/debian/patches
Jens Seidel
jseidel-guest at alioth.debian.org
Tue Aug 14 17:58:30 UTC 2007
Author: jseidel-guest
Date: 2007-08-14 17:58:30 +0000 (Tue, 14 Aug 2007)
New Revision: 3672
Modified:
packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch
packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff
Log:
Refreshed patches to apply cleanly
gettext_i18n.patch: ensure consistent line endings style (DOS) instead of a
mixture of DOS and Unix mode
Modified: packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch 2007-08-14 14:17:06 UTC (rev 3671)
+++ packages/trunk/hex-a-hop/debian/patches/gettext_i18n.patch 2007-08-14 17:58:30 UTC (rev 3672)
@@ -1,8 +1,10 @@
-# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-
---- hex-a-hop-0.0.20070315.orig/i18n.h
-+++ hex-a-hop-0.0.20070315/i18n.h
+# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
+# Licensed under the GPL, see /usr/share/common-licenses/GPL
+
+Index: hex-a-hop.svn/i18n.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ hex-a-hop.svn/i18n.h 2007-08-14 19:37:48.000000000 +0200
@@ -0,0 +1,42 @@
+// (c) 2007 Miriam Ruiz <little_miry at yahoo.es>
+//
@@ -46,17 +48,19 @@
+#endif
+
+#endif
---- hex-a-hop-0.0.20070315.orig/hex_puzzzle.cpp
-+++ hex-a-hop-0.0.20070315/hex_puzzzle.cpp
+Index: hex-a-hop.svn/hex_puzzzle.cpp
+===================================================================
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp 2007-08-14 19:37:45.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp 2007-08-14 19:39:17.000000000 +0200
@@ -16,6 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-+#include "i18n.h"
++#include "i18n.h"
//////////////////////////////////////////////////////
// Config
-@@ -1540,14 +1541,17 @@
+@@ -1579,14 +1580,17 @@
static char tmp1[100];
static LevelInfo tmp = {0, "", tmp1};
@@ -76,7 +80,7 @@
return &tmp;
}
-@@ -2586,33 +2590,33 @@
+@@ -2625,33 +2629,33 @@
if (numUndo>1 && time < undo[0].time)
v[0]=v[1]=v[2]=0;
#ifdef EDIT
@@ -124,7 +128,7 @@
if (numMastered >= numLevels && progress.general.endSequence < 2)
{
-@@ -2664,14 +2668,14 @@
+@@ -2703,14 +2707,14 @@
{
if (progress.general.scoringOn)
{
@@ -143,7 +147,7 @@
}
}
}
-@@ -2712,7 +2716,7 @@
+@@ -2751,7 +2755,7 @@
t=1-t;
int y = SCREEN_H/3 - FONT_SPACING + 1;
y = SCREEN_H + int((y-SCREEN_H)*t);
@@ -152,7 +156,7 @@
}
}
-@@ -2832,7 +2836,7 @@
+@@ -2871,7 +2875,7 @@
}
#ifdef EDIT
@@ -161,7 +165,7 @@
SDL_WM_SetCaption(tmp, NULL);
#endif
}
-@@ -2977,7 +2981,7 @@
+@@ -3016,7 +3020,7 @@
if (button_pressed==256)
{
@@ -170,7 +174,7 @@
if (fn)
{
char * l = strstr(fn, "Levels");
-@@ -4032,13 +4036,13 @@
+@@ -4071,13 +4075,13 @@
Mouse(mousex, mousey, 0, 0, 1024, 0, mouse_buttons);
else if (key=='s' && (mod & KMOD_CTRL)){
@@ -186,8 +190,10 @@
LoadSave(fn, false);
SDL_WM_SetCaption(currentFile, NULL);
}
---- hex-a-hop-0.0.20070315.orig/level_list.h
-+++ hex-a-hop-0.0.20070315/level_list.h
+Index: hex-a-hop.svn/level_list.h
+===================================================================
+--- hex-a-hop.svn.orig/level_list.h 2007-07-06 16:18:54.000000000 +0200
++++ hex-a-hop.svn/level_list.h 2007-08-14 19:37:48.000000000 +0200
@@ -22,112 +22,112 @@
const char *file, *name;
} levelNames[] = {
@@ -407,19 +413,23 @@
+{0, "_90", _("Complete __ levels to unlock")},
};
---- hex-a-hop-0.0.20070315.orig/gfx.cpp
-+++ hex-a-hop-0.0.20070315/gfx.cpp
-@@ -15,6 +15,8 @@
- along with this program; if not, write to the Free Software
+Index: hex-a-hop.svn/gfx.cpp
+===================================================================
+--- hex-a-hop.svn.orig/gfx.cpp 2007-08-14 19:37:45.000000000 +0200
++++ hex-a-hop.svn/gfx.cpp 2007-08-14 19:40:04.000000000 +0200
+@@ -16,6 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-+
-+#include "i18n.h"
++#include "i18n.h"
++
#include "state.h"
---- hex-a-hop-0.0.20070315.orig/i18n.cpp
-+++ hex-a-hop-0.0.20070315/i18n.cpp
+ #ifdef WIN32
+Index: hex-a-hop.svn/i18n.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ hex-a-hop.svn/i18n.cpp 2007-08-14 19:37:48.000000000 +0200
@@ -0,0 +1,40 @@
+// (c) 2007 Miriam Ruiz <little_miry at yahoo.es>
+//
@@ -461,8 +471,10 @@
+bool GetTextInit::IsInit = false;
+
+#endif
---- hex-a-hop-0.0.20070315.orig/menus.h
-+++ hex-a-hop-0.0.20070315/menus.h
+Index: hex-a-hop.svn/menus.h
+===================================================================
+--- hex-a-hop.svn.orig/menus.h 2007-07-06 16:18:54.000000000 +0200
++++ hex-a-hop.svn/menus.h 2007-08-14 19:37:48.000000000 +0200
@@ -84,61 +84,61 @@
const char * hint[] = {
@@ -758,11 +770,13 @@
{
opt[num_opt++] = OPT_FULLSCREEN;
---- hex-a-hop-0.0.20070315.orig/Makefile
-+++ hex-a-hop-0.0.20070315/Makefile
-@@ -4,7 +4,7 @@
- CC = gcc
- CXXFLAGS += -D_VERSION=\"$(VERSION)\" -g
+Index: hex-a-hop.svn/Makefile
+===================================================================
+--- hex-a-hop.svn.orig/Makefile 2007-08-14 19:37:45.000000000 +0200
++++ hex-a-hop.svn/Makefile 2007-08-14 19:37:48.000000000 +0200
+@@ -5,7 +5,7 @@
+ DATA_DIR="."
+ CXXFLAGS += -g
GCC =g++
-CXXSOURCES = gfx.cpp hex_puzzzle.cpp
+CXXSOURCES = gfx.cpp hex_puzzzle.cpp i18n.cpp
Modified: packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff 2007-08-14 14:17:06 UTC (rev 3671)
+++ packages/trunk/hex-a-hop/debian/patches/patch-hex-a-hop-better-than-par.diff 2007-08-14 17:58:30 UTC (rev 3672)
@@ -1,10 +1,11 @@
# Copyright (C) 2007 Sam Hocevar <sam+deb at zoy.org>
# Licensed under the GPL, see /usr/share/common-licenses/GPL
-diff -puriN hex-a-hop.old/hex_puzzzle.cpp hex-a-hop/hex_puzzzle.cpp
---- hex-a-hop.old/hex_puzzzle.cpp 2007-07-06 16:18:54.000000000 +0200
-+++ hex-a-hop/hex_puzzzle.cpp 2007-07-12 16:50:10.000000000 +0200
-@@ -2151,7 +2151,7 @@ struct HexPuzzle : public State
+Index: hex-a-hop.svn/hex_puzzzle.cpp
+===================================================================
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp 2007-08-14 19:43:15.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp 2007-08-14 19:43:18.000000000 +0200
+@@ -2194,7 +2194,7 @@
int par = GetPar(x);
if (progress.general.scoringOn && l->PassesPar( par ))
@@ -13,10 +14,11 @@
}
if (recurse)
return t;
-diff -puriN hex-a-hop.old/savestate.h hex-a-hop/savestate.h
---- hex-a-hop.old/savestate.h 2007-07-06 16:18:54.000000000 +0200
-+++ hex-a-hop/savestate.h 2007-07-12 16:41:35.000000000 +0200
-@@ -88,6 +88,12 @@ public:
+Index: hex-a-hop.svn/savestate.h
+===================================================================
+--- hex-a-hop.svn.orig/savestate.h 2007-08-14 19:43:15.000000000 +0200
++++ hex-a-hop.svn/savestate.h 2007-08-14 19:43:18.000000000 +0200
+@@ -88,6 +88,12 @@
return score <= bestScore;
}
More information about the Pkg-games-commits
mailing list