r15679 - in packages/trunk/val-and-rick/debian: . patches

Markus Koschany apo-guest at moszumanska.debian.org
Thu Dec 31 13:41:04 UTC 2015 

Author: apo-guest
Date: 2015-12-31 13:41:04 +0000 (Thu, 31 Dec 2015)
New Revision: 15679

Added:
   packages/trunk/val-and-rick/debian/patches/libbulletml0v5-segfault.patch
Modified:
   packages/trunk/val-and-rick/debian/changelog
   packages/trunk/val-and-rick/debian/control
   packages/trunk/val-and-rick/debian/copyright
   packages/trunk/val-and-rick/debian/patches/makefile.patch
   packages/trunk/val-and-rick/debian/patches/series
   packages/trunk/val-and-rick/debian/val-and-rick-data.install
   packages/trunk/val-and-rick/debian/val-and-rick.6
   packages/trunk/val-and-rick/debian/val-and-rick.desktop
   packages/trunk/val-and-rick/debian/val-and-rick.docs
   packages/trunk/val-and-rick/debian/val-and-rick.install
Log:
Release 0.1a.dfsg1-5


Modified: packages/trunk/val-and-rick/debian/changelog
===================================================================
--- packages/trunk/val-and-rick/debian/changelog	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/changelog	2015-12-31 13:41:04 UTC (rev 15679)
@@ -1,3 +1,19 @@
+val-and-rick (0.1a.dfsg1-5) unstable; urgency=medium
+
+  * Team upload.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Vcs-Browser: Use https.
+  * val-and-rick-data: Remove superfluous ${shlibs:Depends} substvar.
+  * val-and-rick-data: Suggest val-and-rick.
+  * val-and-rick.desktop: Add keywords and a comment in German.
+  * makefile.patch: Make the build reproducible by setting LC_ALL to C before
+    sorting. Thanks to Reiner Herrmann for the report and patch.
+    (Closes: #792056)
+  * Add libbulletml0v5-segfault.patch and fix a segmentation fault on startup.
+
+ -- Markus Koschany <apo at debian.org>  Thu, 31 Dec 2015 14:09:45 +0100
+
 val-and-rick (0.1a.dfsg1-4) unstable; urgency=low
 
   * Ported to D language version 2 (closes: #707274)
@@ -11,7 +27,7 @@
  -- Peter De Wachter <pdewacht at gmail.com>  Sun, 30 Jun 2013 13:09:10 +0200
 
 val-and-rick (0.1a.dfsg1-3) unstable; urgency=low
-  
+
   * Team upload
   [ Miriam Ruiz ]
   * Replaced XS-DM-Upload-Allowed by DM-Upload-Allowed in debian/control.

Modified: packages/trunk/val-and-rick/debian/control
===================================================================
--- packages/trunk/val-and-rick/debian/control	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/control	2015-12-31 13:41:04 UTC (rev 15679)
@@ -2,18 +2,30 @@
 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
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Peter De Wachter <pdewacht at gmail.com>
+Build-Depends:
+ debhelper (>= 9),
+ gdc (>= 4.8.1),
+ libbulletml-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libphobos-dev,
+ libsdl-mixer1.2-dev,
+ libsdl1.2-dev
+Build-Conflicts:
+ libphobos-4.4-dev
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/val-and-rick/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/val-and-rick/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/val-and-rick/
 
 Package: val-and-rick
 Architecture: any
-Depends: val-and-rick-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ val-and-rick-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: shooter game
  Val & Rick is probably the precursor to Gunroar, featuring similar controls
  but in a different environment. Only 2D sprites and backgrounds are used in
@@ -24,8 +36,10 @@
 Package: val-and-rick-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: val-and-rick
+Depends:
+ ${misc:Depends}
+Suggests:
+ val-and-rick
 Description: shooter game - game data
  Val & Rick is probably the precursor to Gunroar, featuring similar controls
  but in a different environment. Only 2D sprites and backgrounds are used in

Modified: packages/trunk/val-and-rick/debian/copyright
===================================================================
--- packages/trunk/val-and-rick/debian/copyright	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/copyright	2015-12-31 13:41:04 UTC (rev 15679)
@@ -3,11 +3,11 @@
 
 It was downloaded from http://www.asahi-net.or.jp/~cs8k-cyu/windows/vr0_1a.zip
 
-Upstream Author: 
+Upstream Author:
 
     Kenta Cho <cs8k-cyu at asahi-net.or.jp>
 
-Copyright: 
+Copyright:
 
     Copyright 2005 Kenta Cho
 
@@ -17,25 +17,25 @@
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
-    are met: 
+    are met:
 
-     1. Redistributions of source code must retain the above copyright notice, 
-        this list of conditions and the following disclaimer. 
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright notice, 
-        this list of conditions and the following disclaimer in the documentation 
-        and/or other materials provided with the distribution. 
+     2. Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, 
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-    THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-    OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
-    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+    THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+    OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 import/SDL*:

Added: packages/trunk/val-and-rick/debian/patches/libbulletml0v5-segfault.patch
===================================================================
--- packages/trunk/val-and-rick/debian/patches/libbulletml0v5-segfault.patch	                        (rev 0)
+++ packages/trunk/val-and-rick/debian/patches/libbulletml0v5-segfault.patch	2015-12-31 13:41:04 UTC (rev 15679)
@@ -0,0 +1,32 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 31 Dec 2015 14:30:17 +0100
+Subject: libbulletml0v5 segfault
+
+Remove the check because it causes a segmentation fault at runtime with the
+latest version of bulletml.
+
+Forwarded: no
+---
+ src/abagames/vr/barrage.d | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/abagames/vr/barrage.d b/src/abagames/vr/barrage.d
+index 3e32b51..c19b05f 100644
+--- a/src/abagames/vr/barrage.d
++++ b/src/abagames/vr/barrage.d
+@@ -42,14 +42,12 @@ public class BarrageManager {
+   }
+ 
+   public static BulletMLParserTinyXML* getInstance(string dirName, string fileName) {
+-    if (!parser[dirName][fileName]) {
+       string barrageName = dirName ~ "/" ~ fileName;
+       Logger.info("Loading 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/val-and-rick/debian/patches/makefile.patch
===================================================================
--- packages/trunk/val-and-rick/debian/patches/makefile.patch	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/patches/makefile.patch	2015-12-31 13:41:04 UTC (rev 15679)
@@ -5,7 +5,7 @@
 +++ b/Makefile
 @@ -0,0 +1,12 @@
 +GDC=gdc
-+DSRC=$(shell find import src/abagames -name "*.d" | sort)
++DSRC=$(shell find import src/abagames -name "*.d" | LC_ALL=C sort)
 +EXE=val-and-rick
 +
 +all: $(EXE)

Modified: packages/trunk/val-and-rick/debian/patches/series
===================================================================
--- packages/trunk/val-and-rick/debian/patches/series	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/patches/series	2015-12-31 13:41:04 UTC (rev 15679)
@@ -8,3 +8,4 @@
 endian-clean.patch
 avoid-segfault-when-sdl-fails.patch
 dlang_v2.patch
+libbulletml0v5-segfault.patch

Modified: packages/trunk/val-and-rick/debian/val-and-rick-data.install
===================================================================
--- packages/trunk/val-and-rick/debian/val-and-rick-data.install	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/val-and-rick-data.install	2015-12-31 13:41:04 UTC (rev 15679)
@@ -1,3 +1,3 @@
+barrage usr/share/games/val-and-rick/
 images usr/share/games/val-and-rick/
 sounds usr/share/games/val-and-rick/
-barrage usr/share/games/val-and-rick/

Modified: packages/trunk/val-and-rick/debian/val-and-rick.6
===================================================================
--- packages/trunk/val-and-rick/debian/val-and-rick.6	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/val-and-rick.6	2015-12-31 13:41:04 UTC (rev 15679)
@@ -1,16 +1,16 @@
 .\" (c) 2007 Miriam Ruiz <little_miry at yahoo.es>
 .\" (c) 2005 Kenta Cho <cs8k-cyu at asahi-net.or.jp>
-.\" 
+.\"
 .\" This document is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
 .\" the Free Software Foundation; either version 2 of the License, or
 .\" (at your option) any later version.
-.\" 
+.\"
 .\" This package is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
 .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\" GNU General Public License for more details.
-.\" 
+.\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with this package; if not, write to the Free Software
 .\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -21,29 +21,29 @@
 Val and Rick is probably the precursor to Gunroar, featuring similar controls but in a different environment. Only 2D sprites and backgrounds are used in what seems like a tribute to Xevious and Star Soldier.
 .SH "OPTIONS"
 These options are available:
-.TP 
+.TP
 \fB\-brightness n\fR
 Set the brightness of the screen.(n = 0 \- 100, default = 100)
-.TP 
+.TP
 \fB\-luminous n\fR
 Set the luminous intensity.(n = 0 \- 100, default = 50)
-.TP 
+.TP
 \fB\-nosound\fR
 Stop the sound.
-.TP 
+.TP
 \fB\-window\fR
 Launch the game in a window.
-.TP 
+.TP
 \fB\-fullscreen\fR
 Launch the game in fullscreen.
-.TP 
+.TP
 \fB\-res width height\fR
 Sets the resolution of the screen in pixels.
-.TP 
+.TP
 \fB\-nosound\fR
-.TP 
+.TP
 \fB\-nowait\fR
-.TP 
+.TP
 \fB\-accframe\fR
 .SH "USAGE"
 Press the Z key to shoot and hold down the X key to fix the direction of your aim.

Modified: packages/trunk/val-and-rick/debian/val-and-rick.desktop
===================================================================
--- packages/trunk/val-and-rick/debian/val-and-rick.desktop	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/val-and-rick.desktop	2015-12-31 13:41:04 UTC (rev 15679)
@@ -3,7 +3,9 @@
 Name=Val & Rick
 GenericName=
 Comment=Kenta Cho's Val & Rick
+Comment[de]=Kenta Chos Val & Rick
 Icon=val-and-rick
 Exec=val-and-rick
 Terminal=false
 Categories=Game;ArcadeGame;
+Keywords=shooter;arcade;space;ship;

Modified: packages/trunk/val-and-rick/debian/val-and-rick.docs
===================================================================
--- packages/trunk/val-and-rick/debian/val-and-rick.docs	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/val-and-rick.docs	2015-12-31 13:41:04 UTC (rev 15679)
@@ -1,2 +1,2 @@
+debian/readme_e.txt
 readme.txt
-debian/readme_e.txt

Modified: packages/trunk/val-and-rick/debian/val-and-rick.install
===================================================================
--- packages/trunk/val-and-rick/debian/val-and-rick.install	2015-12-31 12:57:15 UTC (rev 15678)
+++ packages/trunk/val-and-rick/debian/val-and-rick.install	2015-12-31 13:41:04 UTC (rev 15679)
@@ -1,3 +1,3 @@
+debian/*.desktop usr/share/applications/
+debian/*.xpm usr/share/pixmaps/
 val-and-rick usr/games/
-debian/*.xpm usr/share/pixmaps/
-debian/*.desktop usr/share/applications/

More information about the Pkg-games-commits mailing list