r15603 - in packages/trunk/holotz-castle/debian: . patches
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Nov 26 16:37:28 UTC 2015
Author: apo-guest
Date: 2015-11-26 16:37:27 +0000 (Thu, 26 Nov 2015)
New Revision: 15603
Added:
packages/trunk/holotz-castle/debian/patches/15_clang-FTBFS.patch
packages/trunk/holotz-castle/debian/patches/16_hardening.patch
Modified:
packages/trunk/holotz-castle/debian/changelog
packages/trunk/holotz-castle/debian/control
packages/trunk/holotz-castle/debian/copyright
packages/trunk/holotz-castle/debian/holotz-castle-data.install
packages/trunk/holotz-castle/debian/holotz-castle.desktop
packages/trunk/holotz-castle/debian/holotz-castle.install
packages/trunk/holotz-castle/debian/patches/series
packages/trunk/holotz-castle/debian/watch
Log:
Release 1.3.14-7
Modified: packages/trunk/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/changelog 2015-11-26 16:37:27 UTC (rev 15603)
@@ -1,8 +1,22 @@
-holotz-castle (1.3.14-7) UNRELEASED; urgency=low
+holotz-castle (1.3.14-7) unstable; urgency=medium
- * Correct Vcs-* URLs to point to anonscm.debian.org
+ * Team upload.
+ * Vcs-Browser: Use canonical Vcs-URI and https.
+ * wrap-and-sort -sa.
+ * Declare compliance with Debian Policy 3.9.6.
+ * Add keywords and a comment in German.
+ * Change homepage address to Debian Wiki because the original website is
+ gone.
+ * Update debian/copyright to copyright format 1.0. Add missing LGPL-2
+ licensed files.
+ * Add 15_clang-FTBFS.patch. Fix tautological comparison build failures
+ with the clang compiler. Thanks to Alexander for the report and patch.
+ (Closes: #754226)
+ * Add hardening.patch and pass all build flags to the build system.
+ * Remove Suggests: holotz-castle-milanb because this package does not exist
+ anymore. Milanb is already part of holotz-castle.
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:33 +0200
+ -- Markus Koschany <apo at debian.org> Thu, 26 Nov 2015 16:09:36 +0100
holotz-castle (1.3.14-6) unstable; urgency=low
Modified: packages/trunk/holotz-castle/debian/control
===================================================================
--- packages/trunk/holotz-castle/debian/control 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/control 2015-11-26 16:37:27 UTC (rev 15603)
@@ -2,18 +2,28 @@
Section: games
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 (>= 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.4
-Homepage: http://www.mainreactor.net/holotzcastle/en/index_en.html
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ dpkg-dev (>= 1.13.19),
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-ttf2.0-dev,
+ libsdl1.2-dev,
+ zlib1g-dev
+Standards-Version: 3.9.6
+Homepage: https://wiki.debian.org/Games/HolotzCastle
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/holotz-castle/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/holotz-castle/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/holotz-castle/
Package: holotz-castle
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, holotz-castle-data (= ${source:Version})
-Suggests: holotz-castle-milanb
+Depends:
+ holotz-castle-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: platform game with high doses of mystery
A great mystery is hidden beyond the walls of Holotz's Castle. Will
you be able to help Ybelle and Ludar to escape alive from the castle?
@@ -21,9 +31,12 @@
Package: holotz-castle-data
Architecture: all
-Conflicts: holotz-castle-milanb
-Provides: holotz-castle-milanb
-Depends: ${misc:Depends}
+Conflicts:
+ holotz-castle-milanb
+Provides:
+ holotz-castle-milanb
+Depends:
+ ${misc:Depends}
Description: platform game with high doses of mystery - data files
This package contains data files for the Holotz's Castle game.
.
@@ -31,7 +44,10 @@
Package: holotz-castle-editor
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, holotz-castle-data (= ${source:Version})
+Depends:
+ holotz-castle-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: platform game with high doses of mystery - level editor
This package contains the level editor for the Holotz's Castle game.
.
Modified: packages/trunk/holotz-castle/debian/copyright
===================================================================
--- packages/trunk/holotz-castle/debian/copyright 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/copyright 2015-11-26 16:37:27 UTC (rev 15603)
@@ -1,27 +1,31 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Tue, 25 Jan 2005 06:36:21 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Holotz Castle
+Source: http://www.mainreactor.net/en/index_en.html
+Comment:
+ The original website is no longer available. (2015)
-It was downloaded from http://www.mainreactor.net/en/index_en.html
+Files: *
+Copyright: 2003, 2004 Juan Carlos Seijo Pérez
+License: GPL-2+
-Copyright: Copyright (C) 2003, 2004 Juan Carlos Seijo Pérez
+Files: JLib/JLib/*
+Copyright: 2003, 2004 Juan Carlos Seijo Pérez
+License: LGPL-2+
-Upstream Author: Juan Carlos Seijo Pérez <jacob at mainreactor.net>
+Files: debian/*
+Copyright: 2005-2007, Miriam Ruiz <little_miry at yahoo.es>
+ 2009-2013, Barry deFreese <bdefreese at debian.org>
+ 2011, Ansgar Burchardt <ansgar at debian.org>
+ 2011, Felix Geyer <debfx-pkg at fobos.de>
+ 2012, Vincent Legout <vlegout at debian.org>
+ 2015, Markus Koschany <apo at debian.org>
+License: GPL-2+
-License:
- This package 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; version 2 dated June, 1991.
+License: LGPL-2+
+ On Debian systems, the complete text of version 2 of the GNU Library General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'.
- 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 Street, Fifth Floor, Boston, MA
- 02110-1301, USA
-
-On Debian systems, the complete text of version 2 of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License: GPL-2+
+ On Debian systems, the complete text of version 2 of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
Modified: packages/trunk/holotz-castle/debian/holotz-castle-data.install
===================================================================
--- packages/trunk/holotz-castle/debian/holotz-castle-data.install 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/holotz-castle-data.install 2015-11-26 16:37:27 UTC (rev 15603)
@@ -1,16 +1,16 @@
-res/languages.txt usr/share/games/holotz-castle/game/
-res/playlist.txt usr/share/games/holotz-castle/game/
+HCedHome/res/* usr/share/games/holotz-castle/editor
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/languages.txt usr/share/games/holotz-castle/game/
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/playlist.txt usr/share/games/holotz-castle/game/
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
Modified: packages/trunk/holotz-castle/debian/holotz-castle.desktop
===================================================================
--- packages/trunk/holotz-castle/debian/holotz-castle.desktop 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/holotz-castle.desktop 2015-11-26 16:37:27 UTC (rev 15603)
@@ -4,8 +4,10 @@
GenericName=holotz-castle
Comment=Play an exciting mystery game
Comment[es]=Juega a un excitante juego de misterio
-Comment[ro_RO]=Jucați un joc misterios și antrenant
+Comment[ro_RO]=Jucați un joc misterios și antrenant
+Comment[de]=Spiele ein aufregendes und geheimnisvolles Spiel
Icon=holotz-castle
Exec=holotz-castle
Terminal=false
Categories=Game;ArcadeGame;
+Keywords=mystery;castle;platform;
Modified: packages/trunk/holotz-castle/debian/holotz-castle.install
===================================================================
--- packages/trunk/holotz-castle/debian/holotz-castle.install 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/holotz-castle.install 2015-11-26 16:37:27 UTC (rev 15603)
@@ -1,3 +1,3 @@
+debian/holotz-castle.desktop usr/share/applications
debian/holotz-castle.xpm usr/share/pixmaps
-debian/holotz-castle.desktop usr/share/applications
holotz-castle usr/games/
Added: packages/trunk/holotz-castle/debian/patches/15_clang-FTBFS.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/15_clang-FTBFS.patch (rev 0)
+++ packages/trunk/holotz-castle/debian/patches/15_clang-FTBFS.patch 2015-11-26 16:37:27 UTC (rev 15603)
@@ -0,0 +1,132 @@
+From: Alexander <sanek23994 at gmail.com>
+Date: Thu, 26 Nov 2015 16:13:04 +0100
+Subject: clang FTBFS
+
+Fix FTBFS with the clang compiler.
+
+Bug: https://bugs.debian.org/754226
+Forwarded: no
+---
+ JLib/JLib/Graphics/JSprite.h | 2 +-
+ JLib/JLib/Util/JApp.cpp | 2 +-
+ JLib/JLib/Util/JApp.h | 2 +-
+ JLib/JLib/Util/JString.h | 4 ++--
+ src/HCObject.h | 2 +-
+ src/HCPreferences.cpp | 2 +-
+ src/HCed.cpp | 2 +-
+ src/HolotzCastle.cpp | 2 +-
+ 8 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/JLib/JLib/Graphics/JSprite.h b/JLib/JLib/Graphics/JSprite.h
+index c88b70c..217e309 100644
+--- a/JLib/JLib/Graphics/JSprite.h
++++ b/JLib/JLib/Graphics/JSprite.h
+@@ -143,7 +143,7 @@ public:
+ */
+ void CurFrame(const u32 newFrame)
+ {
+- if (newFrame >= 0 && newFrame < numFrames) curFrame = newFrame;
++ if (newFrame < numFrames) curFrame = newFrame;
+ }
+
+ /** Devuelve el frame en la posición indicada.
+diff --git a/JLib/JLib/Util/JApp.cpp b/JLib/JLib/Util/JApp.cpp
+index e00ce5c..f130faa 100644
+--- a/JLib/JLib/Util/JApp.cpp
++++ b/JLib/JLib/Util/JApp.cpp
+@@ -57,7 +57,7 @@ JApp::JApp(const JString &strTitle, s32 w, s32 h, bool fullScr, s32 _depth, u32
+ }
+
+ // Inicializa la aplicación
+-bool JApp::Init()
++bool JApp::Init(s32 argc, char **argv)
+ {
+ if (-1 == SDL_Init(SDL_INIT_EVERYTHING))
+ {
+diff --git a/JLib/JLib/Util/JApp.h b/JLib/JLib/Util/JApp.h
+index 2573f4c..061a859 100644
+--- a/JLib/JLib/Util/JApp.h
++++ b/JLib/JLib/Util/JApp.h
+@@ -175,7 +175,7 @@ public:
+ * to do the SDL initialization stuff.
+ * @return <b>true</b> if the creation succeded <b>false</b> if not.
+ */
+- virtual bool Init();
++ virtual bool Init(s32 argc = 0, char **argv = 0);
+
+ /** Updates the application objects (graphics, sounds, A.I., etc.). Must be implemented in the child class.
+ * JApp will call this method before Draw in the child class (by means of MainLoop().
+diff --git a/JLib/JLib/Util/JString.h b/JLib/JLib/Util/JString.h
+index cde421f..0639bab 100644
+--- a/JLib/JLib/Util/JString.h
++++ b/JLib/JLib/Util/JString.h
+@@ -405,7 +405,7 @@ inline JString::JString(const JString& s, u32 start, u32 end)
+ if (end == (u32)-1)
+ end = s.Length();
+
+- if (start >= 0 && start < s.Length() && end > start && end <= s.Length())
++ if (start < s.Length() && end > start && end <= s.Length())
+ {
+ length = end - start;
+ data = new char[length + 1];
+@@ -429,7 +429,7 @@ inline JString::JString(const char *s, u32 start, u32 end)
+ if (end == (u32)-1)
+ end = len;
+
+- if (start >= 0 && start < len && end > start && end <= len)
++ if (start < len && end > start && end <= len)
+ {
+ length = end - start;
+ data = new char[length + 1];
+diff --git a/src/HCObject.h b/src/HCObject.h
+index c932d1e..d286c47 100644
+--- a/src/HCObject.h
++++ b/src/HCObject.h
+@@ -118,7 +118,7 @@ class HCObject : public JDrawable
+ /** Gets this object's position.
+ * @return Object's position.
+ */
+- virtual const JVector & Pos() {return pos;}
++ virtual const JVector & Pos() const {return pos;}
+
+ /** Returns the normal sprite.
+ * @return The normal sprite.
+diff --git a/src/HCPreferences.cpp b/src/HCPreferences.cpp
+index 4fe4cb8..3958e38 100644
+--- a/src/HCPreferences.cpp
++++ b/src/HCPreferences.cpp
+@@ -219,7 +219,7 @@ s32 HCPreferences::Save(const char *filename)
+ }
+
+ // Saves the preferences
+- if (0 > f.Printf("language=%d\nvideo=%d\nbpp=%d\nfullscreen=%d\naudio=%d\ndifficulty=%d", curLang, videoMode, bpp, fullscreen ? 1 : 0, sound ? 1 : 0, difficulty))
++ if (0 == f.Printf("language=%d\nvideo=%d\nbpp=%d\nfullscreen=%d\naudio=%d\ndifficulty=%d", curLang, videoMode, bpp, fullscreen ? 1 : 0, sound ? 1 : 0, difficulty))
+ {
+ // Incorrect file
+ return 2;
+diff --git a/src/HCed.cpp b/src/HCed.cpp
+index a1f65b3..f8ee143 100644
+--- a/src/HCed.cpp
++++ b/src/HCed.cpp
+@@ -49,7 +49,7 @@ HCPreferences prefs;
+
+ void HCed::PrintUsage(char *program)
+ {
+- fprintf(stderr, "HCed v1.3. (C) Juan Carlos Seijo Pérez - 2004.\n\n");
++ fprintf(stderr, "HCed v1.3. (C) Juan Carlos Seijo Perez - 2004.\n\n");
+ fprintf(stderr, "Usage: %s [-t themeName] [story name] [levelToLoad]", program);
+ fprintf(stderr, " [-h] [-r numRows] [-c numColumns]");
+ fprintf(stderr, " [-f]ullscreen [-w]indowed [--fps nnn] [-mWxHxBPP]\n");
+diff --git a/src/HolotzCastle.cpp b/src/HolotzCastle.cpp
+index 658d9e0..f599bed 100644
+--- a/src/HolotzCastle.cpp
++++ b/src/HolotzCastle.cpp
+@@ -232,7 +232,7 @@ bool HCApp::Init(s32 argc, char **argv)
+ return false;
+ }
+
+- if (!JApp::Init())
++ if (!JApp::Init(0, 0))
+ {
+ return false;
+ }
Added: packages/trunk/holotz-castle/debian/patches/16_hardening.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/16_hardening.patch (rev 0)
+++ packages/trunk/holotz-castle/debian/patches/16_hardening.patch 2015-11-26 16:37:27 UTC (rev 15603)
@@ -0,0 +1,71 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 26 Nov 2015 17:00:39 +0100
+Subject: hardening
+
+Add hardening build flags.
+---
+ JLib/Makefile | 8 ++++++--
+ src/Makefile | 10 ++++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/JLib/Makefile b/JLib/Makefile
+index c15e044..0575ea2 100644
+--- a/JLib/Makefile
++++ b/JLib/Makefile
+@@ -6,6 +6,10 @@ UTIL=JLib/Util
+ MATH=JLib/Math
+ SOUND=JLib/Sound
+ PHYSICS=JLib/Physics
++HARDENING := $(shell dpkg-buildflags --get CFLAGS)
++HARDENING += $(shell dpkg-buildflags --get CPPFLAGS)
++HARDENING += $(shell dpkg-buildflags --get CXXFLAGS)
++HARDENING_LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+
+ JLIB_OBJS=$(GRAPHICS)/JControl.o $(GRAPHICS)/JUI.o $(GRAPHICS)/JGLAxes.o $(GRAPHICS)/JGLCamera.o $(GRAPHICS)/JGLConsole.o\
+ $(GRAPHICS)/JGLGrid.o $(GRAPHICS)/JGLLight.o $(GRAPHICS)/JGLTexture.o $(GRAPHICS)/JGLVector.o \
+@@ -20,7 +24,7 @@ endif
+
+ # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
+ MORE_CFLAGS= -O3
+-CFLAGS=-I. -I/usr/local/include/SDL $(MORE_CFLAGS) -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
++CFLAGS=-I. -I/usr/local/include/SDL $(MORE_CFLAGS) $(HARDENING) -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
+
+ # Sample LDFLAGS for applications
+ # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
+@@ -29,7 +33,7 @@ all: libJLib
+
+ # JLib
+ libJLib: $(JLIB_OBJS)
+- g++ -shared -L/usr/lib -fPIC -o $@.so $? \
++ g++ $(HARDENING_LDFLAGS) -shared -L/usr/lib -fPIC -o $@.so $? \
+ && ar rvus $@.a $? \
+
+ $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
+diff --git a/src/Makefile b/src/Makefile
+index bde1eba..e5e7730 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,6 +1,11 @@
+ # Makefile Para Holotz's Castle. (C) Juan Carlos Seijo Pérez - 2004.
+ # Makefile for Holotz's Castle.
+
++HARDENING := $(shell dpkg-buildflags --get CFLAGS)
++HARDENING += $(shell dpkg-buildflags --get CPPFLAGS)
++HARDENING += $(shell dpkg-buildflags --get CXXFLAGS)
++HARDENING_LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
++
+ ifndef SDL_CONFIG
+ SDL_CONFIG = sdl-config
+ endif
+@@ -43,8 +48,9 @@ HCED_OBJ_MAIN=HCed.o
+ # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
+ # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
+ MORE_CFLAGS= -O3
+-CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL $(MORE_CFLAGS) -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c
+-LDFLAGS=-ffast-math
++
++CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL $(MORE_CFLAGS) $(HARDENING) -Wall -Wshadow $(CPU_OPTS) -ffast-math -c
++LDFLAGS=-ffast-math $(HARDENING_LDFLAGS)
+ LIBS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` -lz
+
+
Modified: packages/trunk/holotz-castle/debian/patches/series
===================================================================
--- packages/trunk/holotz-castle/debian/patches/series 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/patches/series 2015-11-26 16:37:27 UTC (rev 15603)
@@ -12,3 +12,5 @@
12_gcc-4.6.patch
13_gcc-4.8.patch
14_spelling_errors.patch
+15_clang-FTBFS.patch
+16_hardening.patch
Modified: packages/trunk/holotz-castle/debian/watch
===================================================================
--- packages/trunk/holotz-castle/debian/watch 2015-11-24 16:23:18 UTC (rev 15602)
+++ packages/trunk/holotz-castle/debian/watch 2015-11-26 16:37:27 UTC (rev 15603)
@@ -1,3 +1,3 @@
-version=3
-
-http://www.mainreactor.net/holotzcastle/download/holotz-castle-(.*)-src\.tar\.gz
+# The original website is no longer available. The game could be formerly
+# downloaded from
+# http://www.mainreactor.net/holotzcastle/download/holotz-castle-(.*)-src\.tar\.gz
More information about the Pkg-games-commits
mailing list