r14244 - in packages/trunk/holotz-castle/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Sat Jun 8 17:55:43 UTC 2013
Author: bdefreese
Date: 2013-06-08 17:55:43 +0000 (Sat, 08 Jun 2013)
New Revision: 14244
Added:
packages/trunk/holotz-castle/debian/patches/13_gcc-4.8.patch
packages/trunk/holotz-castle/debian/patches/14_spelling_errors.patch
Modified:
packages/trunk/holotz-castle/debian/changelog
packages/trunk/holotz-castle/debian/compat
packages/trunk/holotz-castle/debian/control
packages/trunk/holotz-castle/debian/holotz-castle-data.install
packages/trunk/holotz-castle/debian/patches/series
Log:
Fix gcc-4.8 errors and some minor spelling errors.
Modified: packages/trunk/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog 2013-06-07 18:54:24 UTC (rev 14243)
+++ packages/trunk/holotz-castle/debian/changelog 2013-06-08 17:55:43 UTC (rev 14244)
@@ -1,3 +1,14 @@
+holotz-castle (1.3.14-6) unstable; urgency=low
+
+ * Add patch to fix FTBFS with gcc-4.8. (Closes: #701294).
+ + Thanks to Juhani Numminen for the patch.
+ * Don't install themes/dungeons as they are just duplicates of themes/default.
+ * Add patch to fix spelling errors in manpage and binaries.
+ * Bump debhelper build-dep and compat to 9.
+ * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org> Fri, 07 Jun 2013 16:47:25 -0400
+
holotz-castle (1.3.14-5) unstable; urgency=low
* Team upload.
Modified: packages/trunk/holotz-castle/debian/compat
===================================================================
--- packages/trunk/holotz-castle/debian/compat 2013-06-07 18:54:24 UTC (rev 14243)
+++ packages/trunk/holotz-castle/debian/compat 2013-06-08 17:55:43 UTC (rev 14244)
@@ -1 +1 @@
-8
+9
Modified: packages/trunk/holotz-castle/debian/control
===================================================================
--- packages/trunk/holotz-castle/debian/control 2013-06-07 18:54:24 UTC (rev 14243)
+++ packages/trunk/holotz-castle/debian/control 2013-06-08 17:55:43 UTC (rev 14244)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.13.19),
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.13.19),
libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.mainreactor.net/holotzcastle/en/index_en.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/holotz-castle/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/holotz-castle/
@@ -26,9 +26,14 @@
Depends: ${misc:Depends}
Description: platform game with high doses of mystery - data files
This package contains data files for the Holotz's Castle game.
+ .
+ Included are the milanb and holotz-castle maps.
Package: holotz-castle-editor
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, holotz-castle-data (= ${source:Version})
Description: platform game with high doses of mystery - level editor
This package contains the level editor for the Holotz's Castle game.
+ .
+ The level editor allows you to modify or create new maps and levels
+ for Holotz's Castle.
Modified: packages/trunk/holotz-castle/debian/holotz-castle-data.install
===================================================================
--- packages/trunk/holotz-castle/debian/holotz-castle-data.install 2013-06-07 18:54:24 UTC (rev 14243)
+++ packages/trunk/holotz-castle/debian/holotz-castle-data.install 2013-06-08 17:55:43 UTC (rev 14244)
@@ -1,2 +1,16 @@
-res/* usr/share/games/holotz-castle/game
+res/languages.txt usr/share/games/holotz-castle/game/
+res/playlist.txt usr/share/games/holotz-castle/game/
+res/README.txt usr/share/games/holotz-castle/game/
+res/credits/* usr/share/games/holotz-castle/game/credits/
+res/font/* usr/share/games/holotz-castle/game/font/
+res/help/* usr/share/games/holotz-castle/game/help/
+res/icon/* usr/share/games/holotz-castle/game/icon/
+res/intro/* usr/share/games/holotz-castle/game/intro/
+res/main/* usr/share/games/holotz-castle/game/main/
+res/menu/* usr/share/games/holotz-castle/game/menu/
+res/messages/* usr/share/games/holotz-castle/game/messages/
+res/savedata/* usr/share/games/holotz-castle/game/savedata/
+res/sound/* usr/share/games/holotz-castle/game/sound/
+res/stories/* usr/share/games/holotz-castle/game/stories/
+res/theme/default/* usr/share/games/holotz-castle/game/theme/default/
HCedHome/res/* usr/share/games/holotz-castle/editor
Added: packages/trunk/holotz-castle/debian/patches/13_gcc-4.8.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/13_gcc-4.8.patch (rev 0)
+++ packages/trunk/holotz-castle/debian/patches/13_gcc-4.8.patch 2013-06-08 17:55:43 UTC (rev 14244)
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with gcc-4.8 and -Werror and -Wunused-local-typedefs.
+Author: Juhani Numminen <juhaninumminen0 at gmail.com>
+Bug-Debian: http://bugs.debian.org/701294
+Last-Update: 2013-06-07
+Index: holotz-castle-1.3.14/JLib/JLib/Util/JRW.h
+===================================================================
+--- holotz-castle-1.3.14.orig/JLib/JLib/Util/JRW.h 2013-06-07 16:46:24.000000000 -0400
++++ holotz-castle-1.3.14/JLib/JLib/Util/JRW.h 2013-06-07 17:06:56.000000000 -0400
+@@ -203,7 +203,6 @@
+ */
+ u32 ReadLE32(float *fbuff)
+ {
+- typedef char pre_cxx0x_static_assert[sizeof(u32) == sizeof(float) ? 1 : -1 ];
+ u32 ibuff;
+ if (ReadLE32(&ibuff) == 4)
+ {
+@@ -308,7 +307,6 @@
+ */
+ u32 WriteLE32(const float *fbuff)
+ {
+- typedef char pre_cxx0x_static_assert[sizeof(u32) == sizeof(float) ? 1 : -1 ];
+ u32 ibuff;
+ memcpy(&ibuff, fbuff, sizeof(u32));
+ return WriteLE32(&ibuff);
Added: packages/trunk/holotz-castle/debian/patches/14_spelling_errors.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/14_spelling_errors.patch (rev 0)
+++ packages/trunk/holotz-castle/debian/patches/14_spelling_errors.patch 2013-06-08 17:55:43 UTC (rev 14244)
@@ -0,0 +1,41 @@
+Description: Fix minor spelling errors in manpage and binary files.
+Author: Barry deFreese <bdefreese at debian.org>
+Index: holotz-castle-1.3.14/man/holotz-castle-editor.6
+===================================================================
+--- holotz-castle-1.3.14.orig/man/holotz-castle-editor.6 2013-06-08 09:33:05.000000000 -0400
++++ holotz-castle-1.3.14/man/holotz-castle-editor.6 2013-06-08 09:34:13.000000000 -0400
+@@ -46,7 +46,7 @@
+
+ Other features:
+ \- When adding an item to the map, if you press CTRL key it is adjusted to a cell.
+- \- To adjust a rope's lenght, you select it and, while still pressing mouse button, press ALT key and drag the mouse vertically until getting the desired length.
++ \- To adjust a rope's length, you select it and, while still pressing mouse button, press ALT key and drag the mouse vertically until getting the desired length.
+ \- To adjust a rope's oscillation amplitude, you must select it and, keeping mouse button pressed, press SHIFT key. Real time amplitude is not shown, as it is determined taking into account the distance in vertical to the rope when releasing mouse button.
+
+ .SH "OPTIONS"
+Index: holotz-castle-1.3.14/src/HolotzCastle.cpp
+===================================================================
+--- holotz-castle-1.3.14.orig/src/HolotzCastle.cpp 2009-05-02 05:17:15.000000000 -0400
++++ holotz-castle-1.3.14/src/HolotzCastle.cpp 2013-06-08 09:35:27.000000000 -0400
+@@ -272,7 +272,7 @@
+ {
+ fprintf(stderr,
+ "Could not find data directory.\n\n"
+- "Posible solutions are:\n"
++ "Possible solutions are:\n"
+ " - Open folder JLib-1.3.1/Games/HolotzCastle and double.\n"
+ " click 'holotz-castle' application icon.\n"
+ " - Maybe you did 'make' but didn't do 'make install'.\n"
+Index: holotz-castle-1.3.14/src/HCed.cpp
+===================================================================
+--- holotz-castle-1.3.14.orig/src/HCed.cpp 2009-05-02 05:17:15.000000000 -0400
++++ holotz-castle-1.3.14/src/HCed.cpp 2013-06-08 09:35:58.000000000 -0400
+@@ -1036,7 +1036,7 @@
+ {
+ fprintf(stderr,
+ "Could not find data directory.\n\n"
+- "Posible solutions are:\n"
++ "Possible solutions are:\n"
+ " - Open folder JLib-1.3.1/Games/HolotzCastle and double.\n"
+ " click 'holotz-castle' application icon.\n"
+ " - Maybe you did 'make' but didn't do 'make install'.\n"
Modified: packages/trunk/holotz-castle/debian/patches/series
===================================================================
--- packages/trunk/holotz-castle/debian/patches/series 2013-06-07 18:54:24 UTC (rev 14243)
+++ packages/trunk/holotz-castle/debian/patches/series 2013-06-08 17:55:43 UTC (rev 14244)
@@ -10,3 +10,5 @@
10_dont_hardcode_g++41.patch
11_dirent64.patch
12_gcc-4.6.patch
+13_gcc-4.8.patch
+14_spelling_errors.patch
More information about the Pkg-games-commits
mailing list