r13085 - in packages/tags/torus-trooper: . 0.22.dfsg1-7/debian 0.22.dfsg1-7/debian/patches
Vincent Fourmond
fourmond at alioth.debian.org
Sat Jan 7 15:47:21 UTC 2012
Author: fourmond
Date: 2012-01-07 15:47:21 +0000 (Sat, 07 Jan 2012)
New Revision: 13085
Added:
packages/tags/torus-trooper/0.22.dfsg1-7/
packages/tags/torus-trooper/0.22.dfsg1-7/debian/changelog
packages/tags/torus-trooper/0.22.dfsg1-7/debian/control
packages/tags/torus-trooper/0.22.dfsg1-7/debian/patches/fixes.patch
packages/tags/torus-trooper/0.22.dfsg1-7/debian/rules
packages/tags/torus-trooper/0.22.dfsg1-7/debian/source/
Removed:
packages/tags/torus-trooper/0.22.dfsg1-7/debian/changelog
packages/tags/torus-trooper/0.22.dfsg1-7/debian/control
packages/tags/torus-trooper/0.22.dfsg1-7/debian/patches/fixes.patch
packages/tags/torus-trooper/0.22.dfsg1-7/debian/rules
Log:
[svn-buildpackage] Tagging torus-trooper 0.22.dfsg1-7
Deleted: packages/tags/torus-trooper/0.22.dfsg1-7/debian/changelog
===================================================================
--- packages/trunk/torus-trooper/debian/changelog 2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/changelog 2012-01-07 15:47:21 UTC (rev 13085)
@@ -1,70 +0,0 @@
-torus-trooper (0.22.dfsg1-6) unstable; urgency=low
-
- * Patched for changes in the D language. (Closes: #574326)
-
- -- Peter De Wachter <pdewacht at gmail.com> Wed, 17 Mar 2010 23:49:31 +0100
-
-torus-trooper (0.22.dfsg1-5) unstable; urgency=low
-
- * Hardcoded the order in which object files are passed to the linker,
- avoiding the "circular initialization dependency" error. (Closes: #521387)
-
- -- Peter De Wachter <pdewacht at gmail.com> Sun, 29 Mar 2009 18:44:16 +0200
-
-torus-trooper (0.22.dfsg1-4) unstable; urgency=low
-
- [ Sylvain Beucler]
- * Fix D syntax error in optional torus-trooper-pure.patch
-
- [ Peter De Wachter ]
- * Build a torus-trooper-pure package for the Torus Trooper Pure variant
- of this game.
- - Removed README.Debian which explained how to patch and rebuild manually.
- - fixes.patch: added a Makefile for torus-trooper-pure.
- - dotfile.patch: use a different dotfile for torus-trooper-pure.
- - Wrote a manpage.
- * Changes to keep lintian happy:
- - Added a description to all patches.
- - Use fancy © symbols in debian/copyright.
- * Bumped to Standards Version 3.8.1.
- - Implemented patch target for debian/rules.
- - Fixed 'noopt' build option.
-
- -- Peter De Wachter <pdewacht at gmail.com> Tue, 17 Mar 2009 08:00:55 +0100
-
-torus-trooper (0.22.dfsg1-3) unstable; urgency=low
-
- [ Miriam Ruiz ]
- * Removed Homepage from long description.
- * Replaced XS-DM-Upload-Allowed by DM-Upload-Allowed in debian/control.
-
- [ Barry deFreese ]
- * Remove deprecated encoding tag from desktop file
- * Fix icon name in desktop file (Closes: #459275)
-
- -- Peter De Wachter <pdewacht at gmail.com> Thu, 12 Jun 2008 23:13:29 +0200
-
-torus-trooper (0.22.dfsg1-2) unstable; urgency=low
-
- [ Barry deFreese ]
- * Add watch file
- * Add Homepage field in control
- * Remove XS- from VCS fields in control
-
- [ Peter De Wachter ]
- * Save high score when quitting via escape (Closes: #444372)
- * Make level selection more intuitive (Closes: #444948)
- * Fixed link command, patch from Arthur Loiret. (Closes: #458279, #458642)
- * Fixed segfault when SDL init fails.
-
- [ Miriam Ruiz ]
- * Added XS-DM-Upload-Allowed tag to control to allow uploads from Debian
- Maintainers.
-
- -- Miriam Ruiz <little_miry at yahoo.es> Thu, 03 Jan 2008 12:12:59 +0000
-
-torus-trooper (0.22.dfsg1-1) unstable; urgency=low
-
- * Initial release (Closes: #439684)
-
- -- Miriam Ruiz <little_miry at yahoo.es> Sat, 25 Aug 2007 19:58:40 +0000
Copied: packages/tags/torus-trooper/0.22.dfsg1-7/debian/changelog (from rev 13084, packages/trunk/torus-trooper/debian/changelog)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-7/debian/changelog (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/changelog 2012-01-07 15:47:21 UTC (rev 13085)
@@ -0,0 +1,81 @@
+torus-trooper (0.22.dfsg1-7) unstable; urgency=low
+
+ * Team upload.
+ * Explicitly build with D version 1 (closes: #653092)
+ * Switch to format 3.0 (quilt) and drop build-dep on quilt
+ * Provide build-arch and build-indep targets
+ * Conforms to standards 3.9.2
+
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 07 Jan 2012 16:40:02 +0100
+
+torus-trooper (0.22.dfsg1-6) unstable; urgency=low
+
+ * Patched for changes in the D language. (Closes: #574326)
+
+ -- Peter De Wachter <pdewacht at gmail.com> Wed, 17 Mar 2010 23:49:31 +0100
+
+torus-trooper (0.22.dfsg1-5) unstable; urgency=low
+
+ * Hardcoded the order in which object files are passed to the linker,
+ avoiding the "circular initialization dependency" error. (Closes: #521387)
+
+ -- Peter De Wachter <pdewacht at gmail.com> Sun, 29 Mar 2009 18:44:16 +0200
+
+torus-trooper (0.22.dfsg1-4) unstable; urgency=low
+
+ [ Sylvain Beucler]
+ * Fix D syntax error in optional torus-trooper-pure.patch
+
+ [ Peter De Wachter ]
+ * Build a torus-trooper-pure package for the Torus Trooper Pure variant
+ of this game.
+ - Removed README.Debian which explained how to patch and rebuild manually.
+ - fixes.patch: added a Makefile for torus-trooper-pure.
+ - dotfile.patch: use a different dotfile for torus-trooper-pure.
+ - Wrote a manpage.
+ * Changes to keep lintian happy:
+ - Added a description to all patches.
+ - Use fancy © symbols in debian/copyright.
+ * Bumped to Standards Version 3.8.1.
+ - Implemented patch target for debian/rules.
+ - Fixed 'noopt' build option.
+
+ -- Peter De Wachter <pdewacht at gmail.com> Tue, 17 Mar 2009 08:00:55 +0100
+
+torus-trooper (0.22.dfsg1-3) unstable; urgency=low
+
+ [ Miriam Ruiz ]
+ * Removed Homepage from long description.
+ * Replaced XS-DM-Upload-Allowed by DM-Upload-Allowed in debian/control.
+
+ [ Barry deFreese ]
+ * Remove deprecated encoding tag from desktop file
+ * Fix icon name in desktop file (Closes: #459275)
+
+ -- Peter De Wachter <pdewacht at gmail.com> Thu, 12 Jun 2008 23:13:29 +0200
+
+torus-trooper (0.22.dfsg1-2) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * Add watch file
+ * Add Homepage field in control
+ * Remove XS- from VCS fields in control
+
+ [ Peter De Wachter ]
+ * Save high score when quitting via escape (Closes: #444372)
+ * Make level selection more intuitive (Closes: #444948)
+ * Fixed link command, patch from Arthur Loiret. (Closes: #458279, #458642)
+ * Fixed segfault when SDL init fails.
+
+ [ Miriam Ruiz ]
+ * Added XS-DM-Upload-Allowed tag to control to allow uploads from Debian
+ Maintainers.
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Thu, 03 Jan 2008 12:12:59 +0000
+
+torus-trooper (0.22.dfsg1-1) unstable; urgency=low
+
+ * Initial release (Closes: #439684)
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Sat, 25 Aug 2007 19:58:40 +0000
Deleted: packages/tags/torus-trooper/0.22.dfsg1-7/debian/control
===================================================================
--- packages/trunk/torus-trooper/debian/control 2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/control 2012-01-07 15:47:21 UTC (rev 13085)
@@ -1,46 +0,0 @@
-Source: torus-trooper
-Section: games
-Priority: extra
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, gdc,
- libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
- libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev
-Standards-Version: 3.8.1
-Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt_e.html
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/torus-trooper/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/torus-trooper/?op=log
-DM-Upload-Allowed: yes
-
-Package: torus-trooper
-Architecture: any
-Depends: torus-trooper-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: speeding ship sailing through barrage
- Torus Trooper is a fast-paced abstract scrolling shooter game. It
- features 3D graphics and a style similar to that of games such as
- Tempest.
- .
- Torus Trooper is another gem among many by Kenta Cho.
-
-Package: torus-trooper-pure
-Architecture: any
-Depends: torus-trooper-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: variant of torus-trooper
- Torus Trooper Pure is a fast-paced abstract scrolling shooter game.
- It features 3D graphics and a style similar to that of games such as
- Tempest.
- .
- Torus Trooper Pure is a variant of Torus Trooper. Compared to the
- original, it manages to make the gameplay feel even faster.
-
-Package: torus-trooper-data
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: torus-trooper
-Description: speeding ship sailing through barrage - game data
- Torus Trooper is a fast-paced abstract scrolling shooter game. It
- features 3D graphics and a style similar to that of games such as
- Tempest.
- .
- This package includes the architecture-independent data for Kenta Cho's game
- Torus Trooper.
Copied: packages/tags/torus-trooper/0.22.dfsg1-7/debian/control (from rev 13084, packages/trunk/torus-trooper/debian/control)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-7/debian/control (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/control 2012-01-07 15:47:21 UTC (rev 13085)
@@ -0,0 +1,46 @@
+Source: torus-trooper
+Section: games
+Priority: extra
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
+Build-Depends: debhelper (>= 5), gdc-v1,
+ libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
+ libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev
+Standards-Version: 3.9.2
+Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt_e.html
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/torus-trooper/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/torus-trooper/?op=log
+DM-Upload-Allowed: yes
+
+Package: torus-trooper
+Architecture: any
+Depends: torus-trooper-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: speeding ship sailing through barrage
+ Torus Trooper is a fast-paced abstract scrolling shooter game. It
+ features 3D graphics and a style similar to that of games such as
+ Tempest.
+ .
+ Torus Trooper is another gem among many by Kenta Cho.
+
+Package: torus-trooper-pure
+Architecture: any
+Depends: torus-trooper-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: variant of torus-trooper
+ Torus Trooper Pure is a fast-paced abstract scrolling shooter game.
+ It features 3D graphics and a style similar to that of games such as
+ Tempest.
+ .
+ Torus Trooper Pure is a variant of Torus Trooper. Compared to the
+ original, it manages to make the gameplay feel even faster.
+
+Package: torus-trooper-data
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: torus-trooper
+Description: speeding ship sailing through barrage - game data
+ Torus Trooper is a fast-paced abstract scrolling shooter game. It
+ features 3D graphics and a style similar to that of games such as
+ Tempest.
+ .
+ This package includes the architecture-independent data for Kenta Cho's game
+ Torus Trooper.
Deleted: packages/tags/torus-trooper/0.22.dfsg1-7/debian/patches/fixes.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/fixes.patch 2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/patches/fixes.patch 2012-01-07 15:47:21 UTC (rev 13085)
@@ -1,325 +0,0 @@
-# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
-# Distributed under the same license as the game. See debian/copyright.
-
---- a/import/SDL.d
-+++ b/import/SDL.d
-@@ -20,18 +20,28 @@
- slouken at devolution.com
- */
-
--import SDL_types;
--import SDL_getenv;
--import SDL_error;
--import SDL_rwops;
--import SDL_timer;
--import SDL_audio;
--import SDL_cdrom;
--import SDL_joystick;
--import SDL_events;
--import SDL_video;
--import SDL_byteorder;
--import SDL_Version;
-+public import SDL_Keysym;
-+public import SDL_Version;
-+public import SDL_active;
-+public import SDL_audio;
-+public import SDL_byteorder;
-+public import SDL_cdrom;
-+public import SDL_copying;
-+public import SDL_endian;
-+public import SDL_error;
-+public import SDL_events;
-+public import SDL_getenv;
-+public import SDL_joystick;
-+public import SDL_keyboard;
-+public import SDL_mouse;
-+public import SDL_mutex;
-+public import SDL_quit;
-+public import SDL_rwops;
-+public import SDL_syswm;
-+public import SDL_thread;
-+public import SDL_timer;
-+public import SDL_types;
-+public import SDL_video;
-
- extern(C):
-
-@@ -73,20 +83,3 @@
- */
- void SDL_Quit();
-
--/+
--void SDL_SetModuleHandle(void *hInst);
--extern(Windows) void* GetModuleHandle(char*);
--
--static this()
--{
-- /* Load SDL dynamic link library */
-- if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0)
-- throw new Error("Error loading SDL");
-- SDL_SetModuleHandle(GetModuleHandle(null));
--}
--
--static ~this()
--{
-- SDL_Quit();
--}
--+/
---- a/import/SDL_events.d
-+++ b/import/SDL_events.d
-@@ -304,8 +304,8 @@
- If 'state' is set to SDL_QUERY, SDL_EventState() will return the
- current processing state of the specified event.
- */
--const uint SDL_QUERY = cast(uint) -1;
--const uint SDL_IGNORE = 0;
--const uint SDL_DISABLE = 0;
--const uint SDL_ENABLE = 1;
-+const int SDL_QUERY = -1;
-+const int SDL_IGNORE = 0;
-+const int SDL_DISABLE = 0;
-+const int SDL_ENABLE = 1;
- Uint8 SDL_EventState(Uint8 type, int state);
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,30 @@
-+SOURCES=src/abagames/tt/camera.d src/abagames/tt/boot.d\
-+ src/abagames/tt/barrage.d src/abagames/tt/bullettarget.d\
-+ src/abagames/tt/replay.d src/abagames/tt/ship.d src/abagames/tt/particle.d\
-+ src/abagames/tt/tunnel.d src/abagames/tt/enemy.d src/abagames/tt/bulletactor.d\
-+ src/abagames/tt/gamemanager.d src/abagames/tt/screen.d src/abagames/tt/title.d\
-+ src/abagames/tt/stagemanager.d src/abagames/tt/bulletactorpool.d\
-+ src/abagames/tt/shot.d src/abagames/tt/prefmanager.d\
-+ src/abagames/tt/bulletimpl.d src/abagames/tt/letter.d\
-+ src/abagames/tt/soundmanager.d src/abagames/tt/floatletter.d\
-+ src/abagames/tt/shape.d src/abagames/util/actor.d src/abagames/util/rand.d\
-+ src/abagames/util/sdl/input.d src/abagames/util/sdl/sound.d\
-+ src/abagames/util/sdl/pad.d src/abagames/util/sdl/screen3d.d\
-+ src/abagames/util/sdl/mainloop.d src/abagames/util/sdl/gamemanager.d\
-+ src/abagames/util/sdl/screen.d src/abagames/util/sdl/recordablepad.d\
-+ src/abagames/util/sdl/luminous.d src/abagames/util/sdl/sdlexception.d\
-+ src/abagames/util/sdl/displaylist.d src/abagames/util/sdl/texture.d\
-+ src/abagames/util/iterator.d src/abagames/util/bulletml/bullet.d\
-+ src/abagames/util/bulletml/bulletsmanager.d src/abagames/util/tokenizer.d\
-+ src/abagames/util/prefmanager.d src/abagames/util/vector.d\
-+ src/abagames/util/logger.d import/SDL_video.d import/SDL_mixer.d
-+OBJS=$(SOURCES:.d=.o)
-+EXE=torus-trooper
-+
-+all: $(EXE)
-+
-+$(EXE): $(OBJS)
-+ gdc -o $@ $(OBJS) -lbulletml -lSDL -lGL -lGLU -lSDL_mixer
-+
-+$(OBJS): %.o: %.d
-+ gdc -c -o $@ -Iimport -Isrc $(DFLAGS) $<
---- a/src/abagames/util/logger.d
-+++ b/src/abagames/util/logger.d
-@@ -5,7 +5,7 @@
- */
- module abagames.util.logger;
-
--private import std.stream;
-+private import std.cstream;
- private import std.string;
-
- /**
-@@ -56,28 +56,28 @@
-
- public static void info(char[] msg, bool nline = true) {
- if (nline)
-- stderr.writeLine(msg);
-+ derr.writeLine(msg);
- else
-- stderr.writeString(msg);
-+ derr.writeString(msg);
- }
-
- public static void info(double n, bool nline = true) {
- if (nline)
-- stderr.writeLine(std.string.toString(n));
-+ derr.writeLine(std.string.toString(n));
- else
-- stderr.writeString(std.string.toString(n) ~ " ");
-+ derr.writeString(std.string.toString(n) ~ " ");
- }
-
- public static void error(char[] msg) {
-- stderr.writeLine("Error: " ~ msg);
-+ derr.writeLine("Error: " ~ msg);
- }
-
- public static void error(Exception e) {
-- stderr.writeLine("Error: " ~ e.toString());
-+ derr.writeLine("Error: " ~ e.toString());
- }
-
- public static void error(Error e) {
-- stderr.writeLine("Error: " ~ e.toString());
-+ derr.writeLine("Error: " ~ e.toString());
- if (e.next)
- error(e.next);
- }
---- a/src/abagames/util/sdl/luminous.d
-+++ b/src/abagames/util/sdl/luminous.d
-@@ -9,6 +9,7 @@
- private import std.string;
- private import opengl;
- private import abagames.util.actor;
-+import std.c.string;
-
- /**
- * Luminous effect texture.
-@@ -30,7 +31,7 @@
- }
-
- private void makeLuminousTexture() {
-- uint *data = td;
-+ uint *data = td.ptr;
- int i;
- memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);
- glGenTextures(1, &luminousTexture);
---- a/src/abagames/tt/barrage.d
-+++ b/src/abagames/tt/barrage.d
-@@ -98,6 +98,7 @@
- public static void load() {
- char[][] dirs = listdir(BARRAGE_DIR_NAME);
- foreach (char[] dirName; dirs) {
-+ parser[dirName] = null;
- char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
- foreach (char[] fileName; files) {
- if (getExt(fileName) != "xml")
---- a/src/abagames/tt/camera.d
-+++ b/src/abagames/tt/camera.d
-@@ -155,10 +155,10 @@
- moveCnt--;
- if (moveCnt < 0) {
- moveCnt = 15 + rand.nextInt(15);
-- float lox = fabs(_lookAtPos.x - _cameraPos.x);
-- if (lox > PI)
-- lox = PI * 2 - lox;
-- float ofs = lox * 3 + fabs(_lookAtPos.y - _cameraPos.y);
-+ float newlox = fabs(_lookAtPos.x - _cameraPos.x);
-+ if (newlox > PI)
-+ newlox = PI * 2 - newlox;
-+ float ofs = newlox * 3 + fabs(_lookAtPos.y - _cameraPos.y);
- zoomTrg = 3.0f / ofs;
- if (zoomTrg < zoomMin)
- zoomTrg = zoomMin;
---- a/src/abagames/tt/shape.d
-+++ b/src/abagames/tt/shape.d
-@@ -248,21 +248,23 @@
- float wingD1, float wingD2, int color, int shp, int divNum,
- int rev, bool damaged = false) {
- Structure[] sts;
-- Structure st = new Structure;
-- st.pos.x = ox;
-- st.pos.y = oy;
-- st.d1 = st.d2 = 0;
-- st.width = rocketLength * 0.15;
-- st.height = rocketLength;
-- st.shape = Structure.Shape.ROCKET;
-- st.shapeXReverse = 1;
-- if (!damaged)
-- st.color = 1;
-- else
-- st.color = 0;
-- if (rev == -1)
-- st.pos.x *= -1;
-- sts ~= st;
-+ {
-+ Structure st = new Structure;
-+ st.pos.x = ox;
-+ st.pos.y = oy;
-+ st.d1 = st.d2 = 0;
-+ st.width = rocketLength * 0.15;
-+ st.height = rocketLength;
-+ st.shape = Structure.Shape.ROCKET;
-+ st.shapeXReverse = 1;
-+ if (!damaged)
-+ st.color = 1;
-+ else
-+ st.color = 0;
-+ if (rev == -1)
-+ st.pos.x *= -1;
-+ sts ~= st;
-+ }
- float wofs = offset;
- float whgt = rocketLength * (rand.nextFloat(0.5) + 1.5);
- for (int i = 0; i < wingNum; i++) {
---- a/src/abagames/util/rand.d
-+++ b/src/abagames/util/rand.d
-@@ -165,14 +165,14 @@
-
- void next_state()
- {
-- uint *p=state;
-+ uint *p=state.ptr;
-
- /* if init_genrand() has not been called, */
- /* a default initial seed is used */
- if (initf==0) init_genrand(5489UL);
-
- left = N;
-- next = state;
-+ next = state.ptr;
-
- for (int j=N-M+1; --j; p++)
- *p = p[M] ^ TWIST(p[0], p[1]);
---- a/import/opengl.d
-+++ b/import/opengl.d
-@@ -1116,7 +1116,7 @@
- /*************************************************************/
-
- void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
--void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref);
-+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_);
- GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
- void /*APIENTRY*/glArrayElement (GLint i);
- void /*APIENTRY*/glBegin (GLenum mode);
-@@ -1369,7 +1369,7 @@
- void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
- void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer);
- void /*APIENTRY*/glShadeModel (GLenum mode);
--void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask);
-+void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask);
- void /*APIENTRY*/glStencilMask (GLuint mask);
- void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
- void /*APIENTRY*/glTexCoord1d (GLdouble s);
---- /dev/null
-+++ b/Makefile.pure
-@@ -0,0 +1,34 @@
-+SOURCES=src-hiz/abagames/tt/camera.d src-hiz/abagames/tt/boot.d\
-+ src-hiz/abagames/tt/barrage.d src-hiz/abagames/tt/bullettarget.d\
-+ src-hiz/abagames/tt/replay.d src-hiz/abagames/tt/ship.d\
-+ src-hiz/abagames/tt/particle.d src-hiz/abagames/tt/tunnel.d\
-+ src-hiz/abagames/tt/enemy.d src-hiz/abagames/tt/bulletactor.d\
-+ src-hiz/abagames/tt/gamemanager.d src-hiz/abagames/tt/screen.d\
-+ src-hiz/abagames/tt/title.d src-hiz/abagames/tt/stagemanager.d\
-+ src-hiz/abagames/tt/bulletactorpool.d src-hiz/abagames/tt/shot.d\
-+ src-hiz/abagames/tt/prefmanager.d src-hiz/abagames/tt/bulletimpl.d\
-+ src-hiz/abagames/tt/letter.d src-hiz/abagames/tt/soundmanager.d\
-+ src-hiz/abagames/tt/floatletter.d src-hiz/abagames/tt/shape.d\
-+ src-hiz/abagames/tt/crystal.d\
-+ src-hiz/abagames/util/actor.d src-hiz/abagames/util/rand.d\
-+ src-hiz/abagames/util/sdl/input.d src-hiz/abagames/util/sdl/sound.d\
-+ src-hiz/abagames/util/sdl/pad.d src-hiz/abagames/util/sdl/screen3d.d\
-+ src-hiz/abagames/util/sdl/mainloop.d src-hiz/abagames/util/sdl/gamemanager.d\
-+ src-hiz/abagames/util/sdl/screen.d src-hiz/abagames/util/sdl/recordablepad.d\
-+ src-hiz/abagames/util/sdl/luminous.d src-hiz/abagames/util/sdl/sdlexception.d\
-+ src-hiz/abagames/util/sdl/displaylist.d src-hiz/abagames/util/sdl/texture.d\
-+ src-hiz/abagames/util/iterator.d src-hiz/abagames/util/bulletml/bullet.d\
-+ src-hiz/abagames/util/bulletml/bulletsmanager.d\
-+ src-hiz/abagames/util/tokenizer.d src-hiz/abagames/util/prefmanager.d\
-+ src-hiz/abagames/util/vector.d src-hiz/abagames/util/logger.d\
-+ import/SDL_video.d import/SDL_mixer.d
-+OBJS=$(SOURCES:.d=.o)
-+EXE=torus-trooper-pure
-+
-+all: $(EXE)
-+
-+$(EXE): $(OBJS)
-+ gdc -o $@ $(OBJS) -lbulletml -lSDL -lGL -lGLU -lSDL_mixer
-+
-+$(OBJS): %.o: %.d
-+ gdc -c -o $@ -Iimport -Isrc-hiz -fversion=pure $(DFLAGS) $<
Copied: packages/tags/torus-trooper/0.22.dfsg1-7/debian/patches/fixes.patch (from rev 13084, packages/trunk/torus-trooper/debian/patches/fixes.patch)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-7/debian/patches/fixes.patch (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/patches/fixes.patch 2012-01-07 15:47:21 UTC (rev 13085)
@@ -0,0 +1,325 @@
+# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
+# Distributed under the same license as the game. See debian/copyright.
+
+--- a/import/SDL.d
++++ b/import/SDL.d
+@@ -20,18 +20,28 @@
+ slouken at devolution.com
+ */
+
+-import SDL_types;
+-import SDL_getenv;
+-import SDL_error;
+-import SDL_rwops;
+-import SDL_timer;
+-import SDL_audio;
+-import SDL_cdrom;
+-import SDL_joystick;
+-import SDL_events;
+-import SDL_video;
+-import SDL_byteorder;
+-import SDL_Version;
++public import SDL_Keysym;
++public import SDL_Version;
++public import SDL_active;
++public import SDL_audio;
++public import SDL_byteorder;
++public import SDL_cdrom;
++public import SDL_copying;
++public import SDL_endian;
++public import SDL_error;
++public import SDL_events;
++public import SDL_getenv;
++public import SDL_joystick;
++public import SDL_keyboard;
++public import SDL_mouse;
++public import SDL_mutex;
++public import SDL_quit;
++public import SDL_rwops;
++public import SDL_syswm;
++public import SDL_thread;
++public import SDL_timer;
++public import SDL_types;
++public import SDL_video;
+
+ extern(C):
+
+@@ -73,20 +83,3 @@
+ */
+ void SDL_Quit();
+
+-/+
+-void SDL_SetModuleHandle(void *hInst);
+-extern(Windows) void* GetModuleHandle(char*);
+-
+-static this()
+-{
+- /* Load SDL dynamic link library */
+- if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0)
+- throw new Error("Error loading SDL");
+- SDL_SetModuleHandle(GetModuleHandle(null));
+-}
+-
+-static ~this()
+-{
+- SDL_Quit();
+-}
+-+/
+--- a/import/SDL_events.d
++++ b/import/SDL_events.d
+@@ -304,8 +304,8 @@
+ If 'state' is set to SDL_QUERY, SDL_EventState() will return the
+ current processing state of the specified event.
+ */
+-const uint SDL_QUERY = cast(uint) -1;
+-const uint SDL_IGNORE = 0;
+-const uint SDL_DISABLE = 0;
+-const uint SDL_ENABLE = 1;
++const int SDL_QUERY = -1;
++const int SDL_IGNORE = 0;
++const int SDL_DISABLE = 0;
++const int SDL_ENABLE = 1;
+ Uint8 SDL_EventState(Uint8 type, int state);
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,30 @@
++SOURCES=src/abagames/tt/camera.d src/abagames/tt/boot.d\
++ src/abagames/tt/barrage.d src/abagames/tt/bullettarget.d\
++ src/abagames/tt/replay.d src/abagames/tt/ship.d src/abagames/tt/particle.d\
++ src/abagames/tt/tunnel.d src/abagames/tt/enemy.d src/abagames/tt/bulletactor.d\
++ src/abagames/tt/gamemanager.d src/abagames/tt/screen.d src/abagames/tt/title.d\
++ src/abagames/tt/stagemanager.d src/abagames/tt/bulletactorpool.d\
++ src/abagames/tt/shot.d src/abagames/tt/prefmanager.d\
++ src/abagames/tt/bulletimpl.d src/abagames/tt/letter.d\
++ src/abagames/tt/soundmanager.d src/abagames/tt/floatletter.d\
++ src/abagames/tt/shape.d src/abagames/util/actor.d src/abagames/util/rand.d\
++ src/abagames/util/sdl/input.d src/abagames/util/sdl/sound.d\
++ src/abagames/util/sdl/pad.d src/abagames/util/sdl/screen3d.d\
++ src/abagames/util/sdl/mainloop.d src/abagames/util/sdl/gamemanager.d\
++ src/abagames/util/sdl/screen.d src/abagames/util/sdl/recordablepad.d\
++ src/abagames/util/sdl/luminous.d src/abagames/util/sdl/sdlexception.d\
++ src/abagames/util/sdl/displaylist.d src/abagames/util/sdl/texture.d\
++ src/abagames/util/iterator.d src/abagames/util/bulletml/bullet.d\
++ src/abagames/util/bulletml/bulletsmanager.d src/abagames/util/tokenizer.d\
++ src/abagames/util/prefmanager.d src/abagames/util/vector.d\
++ src/abagames/util/logger.d import/SDL_video.d import/SDL_mixer.d
++OBJS=$(SOURCES:.d=.o)
++EXE=torus-trooper
++
++all: $(EXE)
++
++$(EXE): $(OBJS)
++ gdc-v1 -o $@ $(OBJS) -lbulletml -lSDL -lGL -lGLU -lSDL_mixer
++
++$(OBJS): %.o: %.d
++ gdc-v1 -c -o $@ -Iimport -Isrc $(DFLAGS) $<
+--- a/src/abagames/util/logger.d
++++ b/src/abagames/util/logger.d
+@@ -5,7 +5,7 @@
+ */
+ module abagames.util.logger;
+
+-private import std.stream;
++private import std.cstream;
+ private import std.string;
+
+ /**
+@@ -56,28 +56,28 @@
+
+ public static void info(char[] msg, bool nline = true) {
+ if (nline)
+- stderr.writeLine(msg);
++ derr.writeLine(msg);
+ else
+- stderr.writeString(msg);
++ derr.writeString(msg);
+ }
+
+ public static void info(double n, bool nline = true) {
+ if (nline)
+- stderr.writeLine(std.string.toString(n));
++ derr.writeLine(std.string.toString(n));
+ else
+- stderr.writeString(std.string.toString(n) ~ " ");
++ derr.writeString(std.string.toString(n) ~ " ");
+ }
+
+ public static void error(char[] msg) {
+- stderr.writeLine("Error: " ~ msg);
++ derr.writeLine("Error: " ~ msg);
+ }
+
+ public static void error(Exception e) {
+- stderr.writeLine("Error: " ~ e.toString());
++ derr.writeLine("Error: " ~ e.toString());
+ }
+
+ public static void error(Error e) {
+- stderr.writeLine("Error: " ~ e.toString());
++ derr.writeLine("Error: " ~ e.toString());
+ if (e.next)
+ error(e.next);
+ }
+--- a/src/abagames/util/sdl/luminous.d
++++ b/src/abagames/util/sdl/luminous.d
+@@ -9,6 +9,7 @@
+ private import std.string;
+ private import opengl;
+ private import abagames.util.actor;
++import std.c.string;
+
+ /**
+ * Luminous effect texture.
+@@ -30,7 +31,7 @@
+ }
+
+ private void makeLuminousTexture() {
+- uint *data = td;
++ uint *data = td.ptr;
+ int i;
+ memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);
+ glGenTextures(1, &luminousTexture);
+--- a/src/abagames/tt/barrage.d
++++ b/src/abagames/tt/barrage.d
+@@ -98,6 +98,7 @@
+ public static void load() {
+ char[][] dirs = listdir(BARRAGE_DIR_NAME);
+ foreach (char[] dirName; dirs) {
++ parser[dirName] = null;
+ char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
+ foreach (char[] fileName; files) {
+ if (getExt(fileName) != "xml")
+--- a/src/abagames/tt/camera.d
++++ b/src/abagames/tt/camera.d
+@@ -155,10 +155,10 @@
+ moveCnt--;
+ if (moveCnt < 0) {
+ moveCnt = 15 + rand.nextInt(15);
+- float lox = fabs(_lookAtPos.x - _cameraPos.x);
+- if (lox > PI)
+- lox = PI * 2 - lox;
+- float ofs = lox * 3 + fabs(_lookAtPos.y - _cameraPos.y);
++ float newlox = fabs(_lookAtPos.x - _cameraPos.x);
++ if (newlox > PI)
++ newlox = PI * 2 - newlox;
++ float ofs = newlox * 3 + fabs(_lookAtPos.y - _cameraPos.y);
+ zoomTrg = 3.0f / ofs;
+ if (zoomTrg < zoomMin)
+ zoomTrg = zoomMin;
+--- a/src/abagames/tt/shape.d
++++ b/src/abagames/tt/shape.d
+@@ -248,21 +248,23 @@
+ float wingD1, float wingD2, int color, int shp, int divNum,
+ int rev, bool damaged = false) {
+ Structure[] sts;
+- Structure st = new Structure;
+- st.pos.x = ox;
+- st.pos.y = oy;
+- st.d1 = st.d2 = 0;
+- st.width = rocketLength * 0.15;
+- st.height = rocketLength;
+- st.shape = Structure.Shape.ROCKET;
+- st.shapeXReverse = 1;
+- if (!damaged)
+- st.color = 1;
+- else
+- st.color = 0;
+- if (rev == -1)
+- st.pos.x *= -1;
+- sts ~= st;
++ {
++ Structure st = new Structure;
++ st.pos.x = ox;
++ st.pos.y = oy;
++ st.d1 = st.d2 = 0;
++ st.width = rocketLength * 0.15;
++ st.height = rocketLength;
++ st.shape = Structure.Shape.ROCKET;
++ st.shapeXReverse = 1;
++ if (!damaged)
++ st.color = 1;
++ else
++ st.color = 0;
++ if (rev == -1)
++ st.pos.x *= -1;
++ sts ~= st;
++ }
+ float wofs = offset;
+ float whgt = rocketLength * (rand.nextFloat(0.5) + 1.5);
+ for (int i = 0; i < wingNum; i++) {
+--- a/src/abagames/util/rand.d
++++ b/src/abagames/util/rand.d
+@@ -165,14 +165,14 @@
+
+ void next_state()
+ {
+- uint *p=state;
++ uint *p=state.ptr;
+
+ /* if init_genrand() has not been called, */
+ /* a default initial seed is used */
+ if (initf==0) init_genrand(5489UL);
+
+ left = N;
+- next = state;
++ next = state.ptr;
+
+ for (int j=N-M+1; --j; p++)
+ *p = p[M] ^ TWIST(p[0], p[1]);
+--- a/import/opengl.d
++++ b/import/opengl.d
+@@ -1116,7 +1116,7 @@
+ /*************************************************************/
+
+ void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
+-void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref);
++void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_);
+ GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
+ void /*APIENTRY*/glArrayElement (GLint i);
+ void /*APIENTRY*/glBegin (GLenum mode);
+@@ -1369,7 +1369,7 @@
+ void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+ void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer);
+ void /*APIENTRY*/glShadeModel (GLenum mode);
+-void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask);
++void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask);
+ void /*APIENTRY*/glStencilMask (GLuint mask);
+ void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+ void /*APIENTRY*/glTexCoord1d (GLdouble s);
+--- /dev/null
++++ b/Makefile.pure
+@@ -0,0 +1,34 @@
++SOURCES=src-hiz/abagames/tt/camera.d src-hiz/abagames/tt/boot.d\
++ src-hiz/abagames/tt/barrage.d src-hiz/abagames/tt/bullettarget.d\
++ src-hiz/abagames/tt/replay.d src-hiz/abagames/tt/ship.d\
++ src-hiz/abagames/tt/particle.d src-hiz/abagames/tt/tunnel.d\
++ src-hiz/abagames/tt/enemy.d src-hiz/abagames/tt/bulletactor.d\
++ src-hiz/abagames/tt/gamemanager.d src-hiz/abagames/tt/screen.d\
++ src-hiz/abagames/tt/title.d src-hiz/abagames/tt/stagemanager.d\
++ src-hiz/abagames/tt/bulletactorpool.d src-hiz/abagames/tt/shot.d\
++ src-hiz/abagames/tt/prefmanager.d src-hiz/abagames/tt/bulletimpl.d\
++ src-hiz/abagames/tt/letter.d src-hiz/abagames/tt/soundmanager.d\
++ src-hiz/abagames/tt/floatletter.d src-hiz/abagames/tt/shape.d\
++ src-hiz/abagames/tt/crystal.d\
++ src-hiz/abagames/util/actor.d src-hiz/abagames/util/rand.d\
++ src-hiz/abagames/util/sdl/input.d src-hiz/abagames/util/sdl/sound.d\
++ src-hiz/abagames/util/sdl/pad.d src-hiz/abagames/util/sdl/screen3d.d\
++ src-hiz/abagames/util/sdl/mainloop.d src-hiz/abagames/util/sdl/gamemanager.d\
++ src-hiz/abagames/util/sdl/screen.d src-hiz/abagames/util/sdl/recordablepad.d\
++ src-hiz/abagames/util/sdl/luminous.d src-hiz/abagames/util/sdl/sdlexception.d\
++ src-hiz/abagames/util/sdl/displaylist.d src-hiz/abagames/util/sdl/texture.d\
++ src-hiz/abagames/util/iterator.d src-hiz/abagames/util/bulletml/bullet.d\
++ src-hiz/abagames/util/bulletml/bulletsmanager.d\
++ src-hiz/abagames/util/tokenizer.d src-hiz/abagames/util/prefmanager.d\
++ src-hiz/abagames/util/vector.d src-hiz/abagames/util/logger.d\
++ import/SDL_video.d import/SDL_mixer.d
++OBJS=$(SOURCES:.d=.o)
++EXE=torus-trooper-pure
++
++all: $(EXE)
++
++$(EXE): $(OBJS)
++ gdc-v1 -o $@ $(OBJS) -lbulletml -lSDL -lGL -lGLU -lSDL_mixer
++
++$(OBJS): %.o: %.d
++ gdc-v1 -c -o $@ -Iimport -Isrc-hiz -fversion=pure $(DFLAGS) $<
Deleted: packages/tags/torus-trooper/0.22.dfsg1-7/debian/rules
===================================================================
--- packages/trunk/torus-trooper/debian/rules 2012-01-03 11:43:45 UTC (rev 13067)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/rules 2012-01-07 15:47:21 UTC (rev 13085)
@@ -1,80 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- DFLAGS += -fdebug
-else
- DFLAGS += -O2 -frelease
-endif
-
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
- cp -a src src-hiz
- cd src-hiz && patch -p2 < ../debian/patches/torus-trooper-pure.patch
- touch $@
-
-build: build-stamp
-build-stamp: patch-stamp
- dh_testdir
- $(MAKE) DFLAGS="$(DFLAGS)"
- $(MAKE) DFLAGS="$(DFLAGS)" -fMakefile.pure
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp patch-stamp
- rm -rf src-hiz
- rm -f torus-trooper torus-trooper-pure
- rm -f `find . -name "*.o"`
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-get-orig-source:
- dh_testdir
- dh_testroot
- wget http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt0_22.zip
- unzip tt0_22.zip
- rm tt/*.dll
- rm tt/*.exe
- rm tt/lib/*.lib
- rm tt/resource/*.RES
- tar cvfz ../tt_0.22.dfsg1.orig.tar.gz tt
- rm -rf tt0_22.zip tt
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch get-orig-source
Copied: packages/tags/torus-trooper/0.22.dfsg1-7/debian/rules (from rev 13084, packages/trunk/torus-trooper/debian/rules)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-7/debian/rules (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-7/debian/rules 2012-01-07 15:47:21 UTC (rev 13085)
@@ -0,0 +1,82 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DFLAGS = -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ DFLAGS += -fdebug
+else
+ DFLAGS += -O2 -frelease
+endif
+
+patch: patch-stamp
+patch-stamp:
+ dh_testdir
+ cp -a src src-hiz
+ cd src-hiz && patch -p2 < ../debian/patches/torus-trooper-pure.patch
+ touch $@
+
+build: build-arch build-indep
+
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp: patch-stamp
+ dh_testdir
+ $(MAKE) DFLAGS="$(DFLAGS)"
+ $(MAKE) DFLAGS="$(DFLAGS)" -fMakefile.pure
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp patch-stamp
+ rm -rf src-hiz
+ rm -f torus-trooper torus-trooper-pure
+ rm -f `find . -name "*.o"`
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_install
+ dh_installmenu
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+get-orig-source:
+ dh_testdir
+ dh_testroot
+ wget http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt0_22.zip
+ unzip tt0_22.zip
+ rm tt/*.dll
+ rm tt/*.exe
+ rm tt/lib/*.lib
+ rm tt/resource/*.RES
+ tar cvfz ../tt_0.22.dfsg1.orig.tar.gz tt
+ rm -rf tt0_22.zip tt
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch get-orig-source
More information about the Pkg-games-commits
mailing list