r15597 - in packages/tags/torus-trooper: ! dirs' list truncated !
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Nov 12 17:19:44 UTC 2015
Author: apo-guest
Date: 2015-11-12 17:19:44 +0000 (Thu, 12 Nov 2015)
New Revision: 15597
Added:
packages/tags/torus-trooper/0.22.dfsg1-10/
packages/tags/torus-trooper/0.22.dfsg1-10/debian/changelog
packages/tags/torus-trooper/0.22.dfsg1-10/debian/control
packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/fixes.patch
packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/libbulletml0v5-segfault.patch
packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/series
packages/tags/torus-trooper/0.22.dfsg1-10/debian/torus-trooper.desktop
Removed:
packages/tags/torus-trooper/0.22.dfsg1-10/debian/changelog
packages/tags/torus-trooper/0.22.dfsg1-10/debian/control
packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/fixes.patch
packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/series
packages/tags/torus-trooper/0.22.dfsg1-10/debian/torus-trooper.desktop
Log:
[svn-buildpackage] Tagging torus-trooper 0.22.dfsg1-10
Deleted: packages/tags/torus-trooper/0.22.dfsg1-10/debian/changelog
===================================================================
--- packages/trunk/torus-trooper/debian/changelog 2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/changelog 2015-11-12 17:19:44 UTC (rev 15597)
@@ -1,101 +0,0 @@
-torus-trooper (0.22.dfsg1-9) unstable; urgency=low
-
- * Ported to D language version 2 (closes: #707272)
- - Dropped the torus-trooper-pure variant
- * Added build-depends on libphobos-dev
- * Keep level display visible in title screen (closes: #602808)
- - Thanks to Thomas Preud'homme
- * Switch dh-style minimal rules file
- * Mark -data package as Multi-Arch: foreign
- * Conforms to standards 3.9.4
-
- -- Peter De Wachter <pdewacht at gmail.com> Sun, 30 Jun 2013 13:09:09 +0200
-
-torus-trooper (0.22.dfsg1-8) unstable; urgency=low
-
- * Team upload.
- * Tweak the build order to avoid circular dependencies (closes: #664799)
- * Conforms to standards 3.9.3
-
- -- Vincent Fourmond <fourmond at debian.org> Thu, 29 Mar 2012 21:49:01 +0200
-
-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
Copied: packages/tags/torus-trooper/0.22.dfsg1-10/debian/changelog (from rev 15596, packages/trunk/torus-trooper/debian/changelog)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-10/debian/changelog (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/changelog 2015-11-12 17:19:44 UTC (rev 15597)
@@ -0,0 +1,116 @@
+torus-trooper (0.22.dfsg1-10) unstable; urgency=medium
+
+ * Team upload.
+ * Add libbulletml0v5-segfault.patch. Fix segmentation fault with the latest
+ version of bulletML by removing the check in barrage.d.
+ Thanks to Linus Lüssing for the report. (Closes: #803216)
+ * Declare compliance with Debian Policy 3.9.6.
+ * Vcs-Browser: Use https.
+ * Make the build reproducible by updating fixes.patch and sorting with the
+ locale set to C. Thanks to Reiner Herrmann for the report and patch.
+ (Closes: #797432)
+ * Add keywords to desktop file.
+
+ -- Markus Koschany <apo at debian.org> Thu, 12 Nov 2015 18:03:36 +0100
+
+torus-trooper (0.22.dfsg1-9) unstable; urgency=low
+
+ * Ported to D language version 2 (closes: #707272)
+ - Dropped the torus-trooper-pure variant
+ * Added build-depends on libphobos-dev
+ * Keep level display visible in title screen (closes: #602808)
+ - Thanks to Thomas Preud'homme
+ * Switch dh-style minimal rules file
+ * Mark -data package as Multi-Arch: foreign
+ * Conforms to standards 3.9.4
+
+ -- Peter De Wachter <pdewacht at gmail.com> Sun, 30 Jun 2013 13:09:09 +0200
+
+torus-trooper (0.22.dfsg1-8) unstable; urgency=low
+
+ * Team upload.
+ * Tweak the build order to avoid circular dependencies (closes: #664799)
+ * Conforms to standards 3.9.3
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 29 Mar 2012 21:49:01 +0200
+
+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-10/debian/control
===================================================================
--- packages/trunk/torus-trooper/debian/control 2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/control 2015-11-12 17:19:44 UTC (rev 15597)
@@ -1,36 +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 (>= 9), gdc (>= 4.8.1), libphobos-dev,
- libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
- libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev
-Build-Conflicts: libphobos-4.4-dev
-Standards-Version: 3.9.4
-Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt_e.html
-Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/torus-trooper/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/torus-trooper/
-
-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-data
-Architecture: all
-Multi-Arch: foreign
-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-10/debian/control (from rev 15596, packages/trunk/torus-trooper/debian/control)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-10/debian/control (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/control 2015-11-12 17:19:44 UTC (rev 15597)
@@ -0,0 +1,36 @@
+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 (>= 9), gdc (>= 4.8.1), libphobos-dev,
+ libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
+ libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev
+Build-Conflicts: libphobos-4.4-dev
+Standards-Version: 3.9.6
+Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt_e.html
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/torus-trooper/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/torus-trooper/
+
+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-data
+Architecture: all
+Multi-Arch: foreign
+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-10/debian/patches/fixes.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/fixes.patch 2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/fixes.patch 2015-11-12 17:19:44 UTC (rev 15597)
@@ -1,170 +0,0 @@
-# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
-# Distributed under the same license as the game. See debian/copyright.
-
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,11 @@
-+GDC=gdc
-+DSRC=$(shell find import src -name '*.d' | sort)
-+EXE=torus-trooper
-+
-+all: $(EXE)
-+
-+$(EXE): $(DSRC)
-+ $(GDC) -o $@ $^ -Iimport -Isrc -Wno-deprecated $(DFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -lSDL -lGL -lGLU -lSDL_mixer -lbulletml
-+
-+clean:
-+ rm -f $(EXE)
---- 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]);
Copied: packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/fixes.patch (from rev 15596, packages/trunk/torus-trooper/debian/patches/fixes.patch)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/fixes.patch (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/fixes.patch 2015-11-12 17:19:44 UTC (rev 15597)
@@ -0,0 +1,170 @@
+# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
+# Distributed under the same license as the game. See debian/copyright.
+
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,11 @@
++GDC=gdc
++DSRC=$(shell find import src -name '*.d' | LC_ALL=C sort)
++EXE=torus-trooper
++
++all: $(EXE)
++
++$(EXE): $(DSRC)
++ $(GDC) -o $@ $^ -Iimport -Isrc -Wno-deprecated $(DFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -lSDL -lGL -lGLU -lSDL_mixer -lbulletml
++
++clean:
++ rm -f $(EXE)
+--- 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]);
Copied: packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/libbulletml0v5-segfault.patch (from rev 15596, packages/trunk/torus-trooper/debian/patches/libbulletml0v5-segfault.patch)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/libbulletml0v5-segfault.patch (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/libbulletml0v5-segfault.patch 2015-11-12 17:19:44 UTC (rev 15597)
@@ -0,0 +1,32 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 12 Nov 2015 17:42:56 +0100
+Subject: libbulletml0v5 segfault
+
+Remove the check because it causes a segmentation fault at runtime with the
+latest version of bulletml.
+
+Bug: https://bugs.debian.org/803216
+---
+ src/abagames/tt/barrage.d | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/abagames/tt/barrage.d b/src/abagames/tt/barrage.d
+index df2dbda..219cc54 100644
+--- a/src/abagames/tt/barrage.d
++++ b/src/abagames/tt/barrage.d
+@@ -108,14 +108,12 @@ public class BarrageManager {
+ }
+
+ public static BulletMLParserTinyXML* getInstance(string dirName, string fileName) {
+- if (!parser[dirName][fileName]) {
+ string barrageName = dirName ~ "/" ~ fileName;
+ Logger.info("Load BulletML: " ~ barrageName);
+ parser[dirName][fileName] =
+ BulletMLParserTinyXML_new(std.string.toStringz(BARRAGE_DIR_NAME ~ "/" ~ barrageName));
+ BulletMLParserTinyXML_parse(parser[dirName][fileName]);
+- }
+- return parser[dirName][fileName];
++ return parser[dirName][fileName];
+ }
+
+ public static BulletMLParserTinyXML*[] getInstanceList(string dirName) {
Deleted: packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/series
===================================================================
--- packages/trunk/torus-trooper/debian/patches/series 2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/series 2015-11-12 17:19:44 UTC (rev 15597)
@@ -1,11 +0,0 @@
-imports.patch
-fixes.patch
-directories.patch
-windowed.patch
-dotfile.patch
-window-resizing.patch
-save-score-444372.patch
-level-select-444948.patch
-avoid-segfault-when-sdl-fails.patch
-dlang_v2.patch
-lowest-level-position-602808.patch
Copied: packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/series (from rev 15596, packages/trunk/torus-trooper/debian/patches/series)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/series (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/patches/series 2015-11-12 17:19:44 UTC (rev 15597)
@@ -0,0 +1,12 @@
+imports.patch
+fixes.patch
+directories.patch
+windowed.patch
+dotfile.patch
+window-resizing.patch
+save-score-444372.patch
+level-select-444948.patch
+avoid-segfault-when-sdl-fails.patch
+dlang_v2.patch
+lowest-level-position-602808.patch
+libbulletml0v5-segfault.patch
Deleted: packages/tags/torus-trooper/0.22.dfsg1-10/debian/torus-trooper.desktop
===================================================================
--- packages/trunk/torus-trooper/debian/torus-trooper.desktop 2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/torus-trooper.desktop 2015-11-12 17:19:44 UTC (rev 15597)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Torus Trooper
-GenericName=
-Comment=Kenta Cho's Torus Trooper
-Icon=torus-trooper
-Exec=torus-trooper
-Terminal=false
-Categories=Game;ArcadeGame;
Copied: packages/tags/torus-trooper/0.22.dfsg1-10/debian/torus-trooper.desktop (from rev 15596, packages/trunk/torus-trooper/debian/torus-trooper.desktop)
===================================================================
--- packages/tags/torus-trooper/0.22.dfsg1-10/debian/torus-trooper.desktop (rev 0)
+++ packages/tags/torus-trooper/0.22.dfsg1-10/debian/torus-trooper.desktop 2015-11-12 17:19:44 UTC (rev 15597)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Torus Trooper
+GenericName=
+Comment=Kenta Cho's Torus Trooper
+Icon=torus-trooper
+Exec=torus-trooper
+Terminal=false
+Categories=Game;ArcadeGame;
+Keywords=arcade;shmup;shootemup;
More information about the Pkg-games-commits
mailing list