r4127 - packages/trunk/tumiki-fighters/debian/patches
Miriam Ruiz
baby-guest at alioth.debian.org
Sat Sep 8 14:53:28 UTC 2007
Author: baby-guest
Date: 2007-09-08 14:53:28 +0000 (Sat, 08 Sep 2007)
New Revision: 4127
Modified:
packages/trunk/tumiki-fighters/debian/patches/directories.patch
packages/trunk/tumiki-fighters/debian/patches/dotfile.patch
packages/trunk/tumiki-fighters/debian/patches/fixes.patch
packages/trunk/tumiki-fighters/debian/patches/gdc-0.24-semantics-for-version.patch
packages/trunk/tumiki-fighters/debian/patches/imports.patch
packages/trunk/tumiki-fighters/debian/patches/makefile.patch
packages/trunk/tumiki-fighters/debian/patches/window-resizing.patch
packages/trunk/tumiki-fighters/debian/patches/windowed.patch
Log:
Fixed problem with colors.
Refreshed patches.
Modified: packages/trunk/tumiki-fighters/debian/patches/directories.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/directories.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/directories.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -1,10 +1,10 @@
# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
# Distributed under the same license as the game. See debian/copyright.
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/tf/barragemanager.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/barragemanager.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/tf/barragemanager.d 2007-08-29 00:55:42.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/tf/barragemanager.d 2007-08-29 01:04:48.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/barragemanager.d 2004-05-14 23:35:38.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/barragemanager.d 2007-09-08 13:34:47.000000000 +0000
@@ -18,7 +18,7 @@
public class BarrageManager {
private:
@@ -14,10 +14,10 @@
public static void loadBulletMLs() {
char[][] dirs = listdir(BARRAGE_DIR_NAME);
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/util/sdl/sound.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/sound.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/util/sdl/sound.d 2007-08-29 00:55:42.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/util/sdl/sound.d 2007-08-29 00:56:18.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/sound.d 2004-05-14 23:35:40.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/sound.d 2007-09-08 13:34:47.000000000 +0000
@@ -62,7 +62,7 @@
public class Music: Sound {
public:
@@ -36,10 +36,10 @@
private:
Mix_Chunk* chunk;
int chunkChannel;
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/util/sdl/texture.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/texture.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/util/sdl/texture.d 2007-08-29 00:55:42.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/util/sdl/texture.d 2007-08-29 00:56:18.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/texture.d 2004-05-14 23:35:40.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/texture.d 2007-09-08 13:34:47.000000000 +0000
@@ -15,7 +15,7 @@
*/
public class Texture {
@@ -49,10 +49,10 @@
private:
GLuint num;
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/tf/enemyspec.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2007-08-29 01:05:05.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-08-29 01:06:10.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2007-09-08 13:34:46.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-09-08 13:34:47.000000000 +0000
@@ -22,7 +22,7 @@
float sizeXm, sizeXp, sizeYm, sizeYp;
private:
@@ -62,10 +62,10 @@
// Initialize EnemySpec with the array.
// Tumiki file name(main),
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/tf/field.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/field.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/tf/field.d 2007-08-29 01:05:05.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/tf/field.d 2007-08-29 01:06:00.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/field.d 2004-05-14 23:35:38.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/field.d 2007-09-08 13:34:47.000000000 +0000
@@ -249,7 +249,7 @@
float mtr, mtg, mtb;
float mrr, mrg, mrb;
@@ -75,10 +75,10 @@
// Initialize FieldPattern with the array.
// randSeed, scrollSpeed,
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/tf/stagemanager.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/stagemanager.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/tf/stagemanager.d 2007-08-29 01:05:05.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/tf/stagemanager.d 2007-08-29 01:06:18.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/stagemanager.d 2004-05-14 23:35:38.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/stagemanager.d 2007-09-08 13:34:47.000000000 +0000
@@ -171,7 +171,7 @@
long randSeed;
int warningCnt;
@@ -88,16 +88,99 @@
static int[char[]] posTypeStr;
public static this() {
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/tf/tumikiset.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2007-08-29 01:05:05.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-08-29 01:05:46.000000000 +0200
-@@ -29,7 +29,7 @@
- float sizeXm, sizeXp, sizeYm, sizeYp, size;
- private:
- static TumikiSet[char[]] instances;
-- static const char[] TUMIKI_DIR_NAME = "tumiki";
-+ static const char[] TUMIKI_DIR_NAME = "/usr/share/games/tumiki-fighters/tumiki";
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2007-09-08 13:34:46.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-09-08 14:52:13.000000000 +0000
+@@ -7,6 +7,7 @@
+
+ private import std.string;
+ private import std.math;
++private import std.cstream;
+ private import abagames.util.vector;
+ private import abagames.util.csv;
+ private import abagames.util.iterator;
+@@ -32,16 +33,16 @@
+ static const char[] TUMIKI_DIR_NAME = "tumiki";
static const float BULLET_SPEED_RATIO = 1.2;
static int[char[]] shapeStr;
- static char[][] SHAPE_STR =
+- static char[][] SHAPE_STR =
++ static char[][] SHAPE_STR =
+ ["s", "ul", "ur", "dr", "dl", "u", "r", "d", "l", "pu", "pdr", "pr", "pur", "pd", "pf"];
+ static int[char[]] colorStr;
+- static char[][] COLOR_STR =
++ static char[][] COLOR_STR =
+ ["r", "g", "b", "y", "p", "a", "w", "gr"];
+ static int[char[]] bulletShapeStr;
+- static char[][] BULLET_SHAPE_STR =
++ static char[][] BULLET_SHAPE_STR =
+ ["b", "a", "r"];
+ static int[char[]] bulletColorStr;
+- static char[][] BULLET_COLOR_STR =
++ static char[][] BULLET_COLOR_STR =
+ ["r", "a", "p"];
+
+ public static void randInit() {
+@@ -62,6 +63,7 @@
+ }
+ i = 0;
+ foreach (char[] s; BULLET_COLOR_STR) {
++derr.writeLine("> s: " ~ std.string.toString(s));
+ bulletColorStr[s] = i;
+ i++;
+ }
+@@ -76,6 +78,7 @@
+ // (end when BulletML == e, shape == e)(set a empty barrage when shape == s),
+ // ],
+ public this(char[][] data) {
++ randInit();
+ sizeXm = sizeYm = float.max;
+ sizeXp = sizeYp = float.min;
+ StringIterator si = new StringIterator(data);
+@@ -87,11 +90,11 @@
+ if (!si.hasNext)
+ break;
+ char[] v = si.next;
+- int shape;
+- if(shapeStr.length !is 0) shape = shapeStr[v];
++ int shape;
++ try { shape = shapeStr[v]; } catch (Exception e) {}
+ v = si.next;
+- int color;
+- if(colorStr.length !is 0) color = colorStr[v];
++ int color;
++ try { color = colorStr[v]; } catch (Exception e) {}
+ float x = atof(si.next);
+ float y = atof(si.next);
+ float sizex = atof(si.next);
+@@ -113,17 +116,17 @@
+ ti.addBarrage(new Barrage);
+ continue;
+ }
+- int shape2;
+- if(bulletShapeStr.length !is 0) shape2 = bulletShapeStr[v];
++ int shape;
++ try { shape = bulletShapeStr[v]; } catch (Exception e) {}
+ v = si.next;
+- int color2;
+- if(bulletColorStr.length !is 0) color2 = bulletColorStr[v];
++ int color;
++ try { color = bulletColorStr[v]; } catch (Exception e) {}
+ float size = atof(si.next);
+ float yReverse = atof(si.next);
+ int prevWait = atoi(si.next);
+ int postWait = atoi(si.next);
+ Barrage br = new Barrage
+- (shape2, color2, size, yReverse, prevWait, postWait);
++ (shape, color, size, yReverse, prevWait, postWait);
+ for (;;) {
+ char[] bml = si.next;
+ if (bml == "e")
+@@ -141,6 +144,7 @@
+
+ // Initialize TumikiSet from the file.
+ public this(char[] fileName) {
++ randInit();
+ Logger.info("Load tumiki set: " ~ fileName);
+ char[][] data = CSVTokenizer.readFile(TUMIKI_DIR_NAME ~ "/" ~ fileName);
+ this(data);
Modified: packages/trunk/tumiki-fighters/debian/patches/dotfile.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/dotfile.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/dotfile.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -1,10 +1,10 @@
# Copyright (C) 2007 Peter De Wachter <pdewacht at gmail.com>
# Distributed under the same license as the game. See debian/copyright.
-Index: tumiki-fighters_0.2.dfsg1/src/abagames/tf/prefmanager.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/prefmanager.d
===================================================================
---- tumiki-fighters_0.2.dfsg1.orig/src/abagames/tf/prefmanager.d 2007-08-29 00:56:37.000000000 +0200
-+++ tumiki-fighters_0.2.dfsg1/src/abagames/tf/prefmanager.d 2007-08-29 00:59:29.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/prefmanager.d 2004-05-14 23:35:38.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/prefmanager.d 2007-09-08 13:34:48.000000000 +0000
@@ -6,6 +6,8 @@
module abagames.tf.prefmanager;
Modified: packages/trunk/tumiki-fighters/debian/patches/fixes.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/fixes.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/fixes.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -1,10 +1,10 @@
# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
# Distributed under the same license as the game. See debian/copyright.
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/tf/boot.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/boot.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/tf/boot.d 2004-05-14 23:35:38.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/tf/boot.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/boot.d 2007-09-08 13:34:25.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/boot.d 2007-09-08 14:52:50.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.tf.boot;
@@ -14,10 +14,10 @@
private import std.c.stdlib;
private import abagames.util.logger;
private import abagames.util.sdl.mainloop;
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/tf/enemy.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemy.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/tf/enemy.d 2004-05-15 16:46:52.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/tf/enemy.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemy.d 2007-09-08 13:34:25.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemy.d 2007-09-08 13:34:46.000000000 +0000
@@ -142,13 +142,14 @@
float speed;
Vector[] pt;
@@ -56,10 +56,10 @@
}
manager.addScore(ep.spec.tumikiSet.score, p);
if (ep.firstShield <= 1)
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2004-05-14 23:35:38.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2007-09-08 13:34:25.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-09-08 14:52:52.000000000 +0000
@@ -89,11 +89,10 @@
}
@@ -75,10 +75,10 @@
}
return inst;
}
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/tf/letterrender.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/letterrender.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/tf/letterrender.d 2004-05-14 23:35:38.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/tf/letterrender.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/letterrender.d 2007-09-08 13:34:25.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/letterrender.d 2007-09-08 13:34:46.000000000 +0000
@@ -32,7 +32,7 @@
return s * LETTER_HEIGHT;
}
@@ -88,10 +88,10 @@
glPushMatrix();
glTranslatef(x, y, 0);
glScalef(s, s, s);
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/tf/ship.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/ship.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/tf/ship.d 2004-05-15 16:46:52.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/tf/ship.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/ship.d 2007-09-08 13:34:25.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/ship.d 2007-09-08 13:34:46.000000000 +0000
@@ -70,7 +70,7 @@
bool btnPrsd;
bool pullIn;
@@ -101,10 +101,10 @@
rand = new Rand;
}
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2004-05-14 23:35:38.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2007-09-08 13:34:25.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-09-08 14:52:52.000000000 +0000
@@ -32,19 +32,19 @@
static const char[] TUMIKI_DIR_NAME = "tumiki";
static const float BULLET_SPEED_RATIO = 1.2;
@@ -191,10 +191,10 @@
if (!inst) {
inst = new TumikiSet(fileName);
instances[fileName] = inst;
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/util/logger.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/logger.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/util/logger.d 2004-05-14 23:35:38.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/util/logger.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/logger.d 2007-09-08 13:34:25.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/logger.d 2007-09-08 13:34:46.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.util.logger;
@@ -238,10 +238,10 @@
if (e.next)
error(e.next);
}
-Index: tukimi-fighters-0.2.dfsg1/src/dirent.d
+Index: tumiki-fighters-0.2.dfsg1/src/dirent.d
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/dirent.d 2007-08-26 19:56:41.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/dirent.d 2007-09-08 13:34:46.000000000 +0000
@@ -0,0 +1,10 @@
+import std.string;
+
Modified: packages/trunk/tumiki-fighters/debian/patches/gdc-0.24-semantics-for-version.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/gdc-0.24-semantics-for-version.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/gdc-0.24-semantics-for-version.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -3,8 +3,8 @@
Index: tumiki-fighters-0.2.dfsg1/import/opengl.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/import/opengl.d 2007-08-29 21:03:14.000000000 +0200
-+++ tumiki-fighters-0.2.dfsg1/import/opengl.d 2007-08-29 21:03:27.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/import/opengl.d 2007-09-08 13:34:43.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/opengl.d 2007-09-08 13:34:49.000000000 +0000
@@ -1,10 +1,4 @@
-version (Win32) {
- private import std.c.windows.windows;
@@ -19,8 +19,8 @@
alias ubyte GLboolean;
Index: tumiki-fighters-0.2.dfsg1/import/openglu.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/import/openglu.d 2007-08-29 21:39:09.000000000 +0200
-+++ tumiki-fighters-0.2.dfsg1/import/openglu.d 2007-08-29 21:39:15.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/import/openglu.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/openglu.d 2007-09-08 13:34:49.000000000 +0000
@@ -1,11 +1,6 @@
import opengl;
Modified: packages/trunk/tumiki-fighters/debian/patches/imports.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/imports.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/imports.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -1,10 +1,10 @@
# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
# Distributed under the same license as the game. See debian/copyright.
-Index: tukimi-fighters-0.2.dfsg1/import/opengl.d
+Index: tumiki-fighters-0.2.dfsg1/import/opengl.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/opengl.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/opengl.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/opengl.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/opengl.d 2007-09-08 14:52:44.000000000 +0000
@@ -1116,7 +1116,7 @@
/*************************************************************/
@@ -23,10 +23,10 @@
void /*APIENTRY*/glStencilMask (GLuint mask);
void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
void /*APIENTRY*/glTexCoord1d (GLdouble s);
-Index: tukimi-fighters-0.2.dfsg1/import/SDL.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL.d 2007-09-08 13:34:43.000000000 +0000
@@ -20,18 +20,21 @@
slouken at devolution.com
*/
@@ -74,10 +74,10 @@
SDL_Quit();
}
++/
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_endian.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_endian.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_endian.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_endian.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_endian.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_endian.d 2007-09-08 13:34:43.000000000 +0000
@@ -57,9 +57,9 @@
Uint64 SDL_Swap64(Uint64 val) {
Uint32 hi, lo;
@@ -90,10 +90,10 @@
val = SDL_Swap32(lo);
val <<= 32;
val |= SDL_Swap32(hi);
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_events.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_events.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_events.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_events.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_events.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_events.d 2007-09-08 13:34:43.000000000 +0000
@@ -304,7 +304,7 @@
If 'state' is set to SDL_QUERY, SDL_EventState() will return the
current processing state of the specified event.
@@ -103,10 +103,10 @@
const uint SDL_IGNORE = 0;
const uint SDL_DISABLE = 0;
const uint SDL_ENABLE = 1;
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_getenv.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_getenv.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_getenv.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_getenv.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_getenv.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_getenv.d 2007-09-08 13:34:43.000000000 +0000
@@ -2,6 +2,7 @@
extern(C):
@@ -120,10 +120,10 @@
char *SDL_getenv(char *name);
char *getenv(char* X) { return SDL_getenv(X); }
++/
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_keyboard.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_keyboard.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_keyboard.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_keyboard.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_keyboard.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_keyboard.d 2007-09-08 13:34:43.000000000 +0000
@@ -26,7 +26,7 @@
// !!! A hack! struct SDL_keysym is defined in this module,
// !!! so we need to resolve the nameclash...
@@ -133,9 +133,9 @@
extern(C):
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_keysym_.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_keysym_.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_keysym_.d 2004-04-03 19:36:30.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_keysym_.d 2004-04-03 19:36:30.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,308 +0,0 @@
-/*
@@ -446,10 +446,10 @@
-const uint KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT);
-const uint KMOD_ALT = (KMOD_LALT|KMOD_RALT);
-const uint KMOD_META = (KMOD_LMETA|KMOD_RMETA);
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_Keysym.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_Keysym.d
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_Keysym.d 2007-08-26 19:56:41.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_Keysym.d 2007-09-08 13:34:43.000000000 +0000
@@ -0,0 +1,308 @@
+/*
+ SDL - Simple DirectMedia Layer
@@ -759,10 +759,10 @@
+const uint KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT);
+const uint KMOD_ALT = (KMOD_LALT|KMOD_RALT);
+const uint KMOD_META = (KMOD_LMETA|KMOD_RMETA);
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_mixer.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_mixer.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_mixer.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_mixer.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_mixer.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_mixer.d 2007-09-08 13:34:43.000000000 +0000
@@ -22,7 +22,7 @@
// convert to D by shinichiro.h
@@ -772,10 +772,10 @@
import SDL;
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_mouse.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_mouse.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_mouse.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_mouse.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_mouse.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_mouse.d 2007-09-08 13:34:43.000000000 +0000
@@ -109,6 +109,8 @@
const uint SDL_BUTTON_LEFT = 1;
const uint SDL_BUTTON_MIDDLE = 2;
@@ -785,10 +785,10 @@
const uint SDL_BUTTON_LMASK = SDL_PRESSED << (SDL_BUTTON_LEFT - 1);
const uint SDL_BUTTON_MMASK = SDL_PRESSED << (SDL_BUTTON_MIDDLE - 1);
const uint SDL_BUTTON_RMASK = SDL_PRESSED << (SDL_BUTTON_RIGHT - 1);
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_syswm.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_syswm.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_syswm.d 2004-04-03 19:36:30.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_syswm.d 2007-08-26 19:56:41.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_syswm.d 2004-04-03 19:36:30.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_syswm.d 2007-09-08 13:34:43.000000000 +0000
@@ -22,7 +22,7 @@
/* Include file for SDL custom system window manager hooks */
@@ -798,9 +798,9 @@
extern(C):
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_version_.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_version_.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/import/SDL_version_.d 2004-04-03 19:36:32.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/import/SDL_version_.d 2004-04-03 19:36:32.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
@@ -878,10 +878,10 @@
- use the SDL_Version() macro.
- */
-SDL_version * SDL_Linked_Version();
-Index: tukimi-fighters-0.2.dfsg1/import/SDL_Version.d
+Index: tumiki-fighters-0.2.dfsg1/import/SDL_Version.d
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/import/SDL_Version.d 2007-08-26 19:56:41.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/import/SDL_Version.d 2007-09-08 13:34:43.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ SDL - Simple DirectMedia Layer
Modified: packages/trunk/tumiki-fighters/debian/patches/makefile.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/makefile.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/makefile.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -5,7 +5,7 @@
Index: tumiki-fighters-0.2.dfsg1/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/Makefile 2007-08-29 18:54:38.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/Makefile 2007-09-08 14:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+DC=gdmd
+#DC=gdc
@@ -34,7 +34,7 @@
+
+clean:
+ $(RM) src/*.o
-+ $(RM) src/abagames/p47/*.o
++ $(RM) src/abagames/tf/*.o
+ $(RM) src/abagames/util/*.o
+ $(RM) src/abagames/util/sdl/*.o
+ $(RM) src/abagames/util/bulletml/*.o
Modified: packages/trunk/tumiki-fighters/debian/patches/window-resizing.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/window-resizing.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/window-resizing.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -3,8 +3,8 @@
Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/screen3d.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/screen3d.d 2007-09-01 11:44:08.000000000 +0200
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/screen3d.d 2007-09-01 11:47:06.000000000 +0200
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/screen3d.d 2007-09-08 13:34:48.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/screen3d.d 2007-09-08 13:34:49.000000000 +0000
@@ -23,6 +23,7 @@
static bool windowMode = true;
static float nearPlane = 0.1;
Modified: packages/trunk/tumiki-fighters/debian/patches/windowed.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/windowed.patch 2007-09-08 13:35:22 UTC (rev 4126)
+++ packages/trunk/tumiki-fighters/debian/patches/windowed.patch 2007-09-08 14:53:28 UTC (rev 4127)
@@ -1,10 +1,10 @@
# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
# Distributed under the same license as the game. See debian/copyright.
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/tf/boot.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/boot.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/tf/boot.d 2007-08-26 20:14:10.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/tf/boot.d 2007-08-26 20:14:37.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/boot.d 2007-09-08 13:34:46.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/boot.d 2007-09-08 13:34:48.000000000 +0000
@@ -27,7 +27,7 @@
private void usage(char[] args0) {
@@ -24,10 +24,10 @@
case "-res":
if (i >= args.length - 2) {
usage(args[0]);
-Index: tukimi-fighters-0.2.dfsg1/src/abagames/util/sdl/screen3d.d
+Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/screen3d.d
===================================================================
---- tukimi-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/screen3d.d 2007-08-26 20:15:12.000000000 +0000
-+++ tukimi-fighters-0.2.dfsg1/src/abagames/util/sdl/screen3d.d 2007-08-26 20:15:25.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/screen3d.d 2004-05-14 23:35:40.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/screen3d.d 2007-09-08 14:52:41.000000000 +0000
@@ -20,7 +20,7 @@
static float brightness = 1;
static int width = 640;
More information about the Pkg-games-commits
mailing list