Author: vincentc-guest Date: 2012-06-03 08:55:32 +0000 (Sun, 03 Jun 2012) New Revision: 13663
Added: packages/trunk/openssn/debian/install packages/trunk/openssn/debian/lintian-overrides packages/trunk/openssn/debian/patches/enable-build-hardening.patch packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch Removed: packages/trunk/openssn/debian/openssn.install packages/trunk/openssn/debian/openssn.lintian-overrides Modified: packages/trunk/openssn/debian/changelog packages/trunk/openssn/debian/copyright packages/trunk/openssn/debian/menu packages/trunk/openssn/debian/openssn-data.install packages/trunk/openssn/debian/patches/fix-makefile-typo.patch packages/trunk/openssn/debian/patches/series Log: openssn: Update to release 1.1-1 Modified: packages/trunk/openssn/debian/changelog =================================================================== --- packages/trunk/openssn/debian/changelog 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/changelog 2012-06-03 08:55:32 UTC (rev 13663) @@ -2,4 +2,4 @@ * Initial release. (Closes: #640167) - -- Vincent Cheng <[email protected]> Mon, 09 Apr 2012 16:10:07 -0700 + -- Vincent Cheng <[email protected]> Wed, 30 May 2012 22:16:17 -0700 Modified: packages/trunk/openssn/debian/copyright =================================================================== --- packages/trunk/openssn/debian/copyright 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/copyright 2012-06-03 08:55:32 UTC (rev 13663) @@ -150,4 +150,3 @@ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - Added: packages/trunk/openssn/debian/install =================================================================== --- packages/trunk/openssn/debian/install (rev 0) +++ packages/trunk/openssn/debian/install 2012-06-03 08:55:32 UTC (rev 13663) @@ -0,0 +1,3 @@ +usr/bin/openssn usr/games/ +usr/share/applications/openssn.desktop +usr/share/pixmaps/openssn.png Added: packages/trunk/openssn/debian/lintian-overrides =================================================================== --- packages/trunk/openssn/debian/lintian-overrides (rev 0) +++ packages/trunk/openssn/debian/lintian-overrides 2012-06-03 08:55:32 UTC (rev 13663) @@ -0,0 +1,2 @@ +# False positive; package is built with -D_FORTIFY_SOURCE=2 +openssn: hardening-no-fortify-functions usr/games/openssn Modified: packages/trunk/openssn/debian/menu =================================================================== --- packages/trunk/openssn/debian/menu 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/menu 2012-06-03 08:55:32 UTC (rev 13663) @@ -1,2 +1,2 @@ ?package(openssn):needs="X11" section="Games/Simulation"\ - title="openssn" command="/usr/bin/openssn" + title="openssn" command="/usr/games/openssn" Modified: packages/trunk/openssn/debian/openssn-data.install =================================================================== --- packages/trunk/openssn/debian/openssn-data.install 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/openssn-data.install 2012-06-03 08:55:32 UTC (rev 13663) @@ -1 +1 @@ -usr/share/openssn/* +usr/share/games/openssn/ Deleted: packages/trunk/openssn/debian/openssn.install =================================================================== --- packages/trunk/openssn/debian/openssn.install 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/openssn.install 2012-06-03 08:55:32 UTC (rev 13663) @@ -1,3 +0,0 @@ -usr/bin/openssn -usr/share/applications/openssn.desktop -usr/share/pixmaps/openssn.png Deleted: packages/trunk/openssn/debian/openssn.lintian-overrides =================================================================== --- packages/trunk/openssn/debian/openssn.lintian-overrides 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/openssn.lintian-overrides 2012-06-03 08:55:32 UTC (rev 13663) @@ -1,3 +0,0 @@ -# /usr/games is due to be deprecated in the FHS -# also see http://lists.freedesktop.org/archives/games/2011-May/000369.html -openssn: package-section-games-but-contains-no-game Added: packages/trunk/openssn/debian/patches/enable-build-hardening.patch =================================================================== --- packages/trunk/openssn/debian/patches/enable-build-hardening.patch (rev 0) +++ packages/trunk/openssn/debian/patches/enable-build-hardening.patch 2012-06-03 08:55:32 UTC (rev 13663) @@ -0,0 +1,18 @@ +Description: Enable build hardening flags +Author: Vincent Cheng <[email protected]> +Last-Update: 05-30-2012 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,9 +1,9 @@ + CC = g++ + PREFIX ?= /usr + DEVCFLAGS = -Wall -g -D_GNU_SOURCE `sdl-config --cflags` +-CFLAGS = -g -Wall `sdl-config --cflags` -Wno-write-strings \ ++CFLAGS = -g -Wall `sdl-config --cflags` -Wno-write-strings -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 \ + # -DDEBUG_HELICOPTER # -DDEBUGMAP # -DAIDEBUG # -DDEBUG +-LIBS = -lm -lSDL_gfx -lSDL_image -lSDL_mixer `sdl-config --libs` ++LIBS = -lm -lSDL_gfx -lSDL_image -lSDL_mixer `sdl-config --libs` -Wl,-z,relro + OBJS = main.o sonar.o radar.o esm.o control.o submarine.o adcap.o coord.o stack.o contact.o towedarray.o targetmotionanalysis.o boatpositionlog.o dfont.o dstack.o message.o gameclock.o files.o mission.o menu.o draw.o sound.o map.o winfunctions.o helicopter.o + SSN = ../openssn + DATADIR = $(PREFIX)/share/games/openssn Added: packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch =================================================================== --- packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch (rev 0) +++ packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch 2012-06-03 08:55:32 UTC (rev 13663) @@ -0,0 +1,15 @@ +Description: Fix FTBFS due to header dependency changes in gcc 4.7 + This patch fixes FTBFS by explicitly including unistd.h. +Author: Vincent Cheng <[email protected]> +Last-Update: 05-30-2012 + +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -20,6 +20,7 @@ + #endif + + /*Feeling left out? Get included!*/ ++#include <unistd.h> + #include <iostream> + #include <list> + #include <string.h> Modified: packages/trunk/openssn/debian/patches/fix-makefile-typo.patch =================================================================== --- packages/trunk/openssn/debian/patches/fix-makefile-typo.patch 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/patches/fix-makefile-typo.patch 2012-06-03 08:55:32 UTC (rev 13663) @@ -1,12 +1,20 @@ Description: Fix typo in Makefile The desktop menu entry should be placed in /usr/share/applications/, rather - than a subdir with the same name. + than a subdir with the same name. Also, modify DATADIR path. Forwarded: yes Author: Vincent Cheng <[email protected]> -Last-Update: 2011-11-09 +Last-Update: 2012-05-30 --- a/Makefile +++ b/Makefile +@@ -1,6 +1,6 @@ + PREFIX ?= /usr + SSN = openssn +-DATADIR = $(PREFIX)/share/openssn ++DATADIR = $(PREFIX)/share/games/openssn + OPTDIR = /opt/openssn + VERSION = 1.1 + @@ -30,7 +30,7 @@ cp ships/* $(DATADIR)/ships cp sounds/* $(DATADIR)/sounds Modified: packages/trunk/openssn/debian/patches/series =================================================================== --- packages/trunk/openssn/debian/patches/series 2012-06-03 08:50:35 UTC (rev 13662) +++ packages/trunk/openssn/debian/patches/series 2012-06-03 08:55:32 UTC (rev 13663) @@ -1 +1,3 @@ +fix-gcc47-ftbfs.patch fix-makefile-typo.patch +enable-build-hardening.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
