r15596 - in packages/trunk/torus-trooper/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2015-11-12 17:19:29 +0000 (Thu, 12 Nov 2015)
New Revision: 15596

Added:
   packages/trunk/torus-trooper/debian/patches/libbulletml0v5-segfault.patch
Modified:
   packages/trunk/torus-trooper/debian/changelog
   packages/trunk/torus-trooper/debian/control
   packages/trunk/torus-trooper/debian/patches/fixes.patch
   packages/trunk/torus-trooper/debian/patches/series
   packages/trunk/torus-trooper/debian/torus-trooper.desktop
Log:
Release 0.22.dfsg1-10


Modified: packages/trunk/torus-trooper/debian/changelog
===================================================================
--- packages/trunk/torus-trooper/debian/changelog	2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/trunk/torus-trooper/debian/changelog	2015-11-12 17:19:29 UTC (rev 15596)
@@ -1,3 +1,18 @@
+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)

Modified: packages/trunk/torus-trooper/debian/control
===================================================================
--- packages/trunk/torus-trooper/debian/control	2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/trunk/torus-trooper/debian/control	2015-11-12 17:19:29 UTC (rev 15596)
@@ -7,10 +7,10 @@
  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
+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: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/torus-trooper/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/torus-trooper/
 
 Package: torus-trooper
 Architecture: any

Modified: packages/trunk/torus-trooper/debian/patches/fixes.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/fixes.patch	2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/trunk/torus-trooper/debian/patches/fixes.patch	2015-11-12 17:19:29 UTC (rev 15596)
@@ -5,7 +5,7 @@
 +++ b/Makefile
 @@ -0,0 +1,11 @@
 +GDC=gdc
-+DSRC=$(shell find import src -name '*.d' | sort)
++DSRC=$(shell find import src -name '*.d' | LC_ALL=C sort)
 +EXE=torus-trooper
 +
 +all: $(EXE)

Added: packages/trunk/torus-trooper/debian/patches/libbulletml0v5-segfault.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/libbulletml0v5-segfault.patch	                        (rev 0)
+++ packages/trunk/torus-trooper/debian/patches/libbulletml0v5-segfault.patch	2015-11-12 17:19:29 UTC (rev 15596)
@@ -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) {

Modified: packages/trunk/torus-trooper/debian/patches/series
===================================================================
--- packages/trunk/torus-trooper/debian/patches/series	2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/trunk/torus-trooper/debian/patches/series	2015-11-12 17:19:29 UTC (rev 15596)
@@ -9,3 +9,4 @@
 avoid-segfault-when-sdl-fails.patch
 dlang_v2.patch
 lowest-level-position-602808.patch
+libbulletml0v5-segfault.patch

Modified: packages/trunk/torus-trooper/debian/torus-trooper.desktop
===================================================================
--- packages/trunk/torus-trooper/debian/torus-trooper.desktop	2015-11-11 20:32:05 UTC (rev 15595)
+++ packages/trunk/torus-trooper/debian/torus-trooper.desktop	2015-11-12 17:19:29 UTC (rev 15596)
@@ -7,3 +7,4 @@
 Exec=torus-trooper
 Terminal=false
 Categories=Game;ArcadeGame;
+Keywords=arcade;shmup;shootemup;