r13680 - in packages/trunk/openssn/debian: . patches

[Vincent Cheng]

Author: vincentc-guest
Date: 2012-06-06 04:20:08 +0000 (Wed, 06 Jun 2012)
New Revision: 13680

Added:
   packages/trunk/openssn/debian/patches/fix-datadir-path.patch
Removed:
   packages/trunk/openssn/debian/lintian-overrides
   packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch
   packages/trunk/openssn/debian/patches/fix-makefile-typo.patch
Modified:
   packages/trunk/openssn/debian/changelog
   packages/trunk/openssn/debian/patches/enable-build-hardening.patch
   packages/trunk/openssn/debian/patches/series
Log:
openssn: Update to release 1.3-1


Modified: packages/trunk/openssn/debian/changelog
===================================================================
--- packages/trunk/openssn/debian/changelog	2012-06-05 15:06:57 UTC (rev 13679)
+++ packages/trunk/openssn/debian/changelog	2012-06-06 04:20:08 UTC (rev 13680)
@@ -1,3 +1,15 @@
+openssn (1.3-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fix unintended creation of spurious font.dat/largefont.dat files in
+      current working directory. (Closes: #675744)
+  * Refresh patches.
+    - Remove fix-gcc47-ftbfs.patch; applied upstream.
+    - Rename fix-makefile-typo.patch -> fix-datadir-path.patch
+  * Remove unused lintian override.
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Sun, 03 Jun 2012 20:22:19 -0700
+
 openssn (1.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #640167)

Deleted: packages/trunk/openssn/debian/lintian-overrides
===================================================================
--- packages/trunk/openssn/debian/lintian-overrides	2012-06-05 15:06:57 UTC (rev 13679)
+++ packages/trunk/openssn/debian/lintian-overrides	2012-06-06 04:20:08 UTC (rev 13680)
@@ -1,2 +0,0 @@
-# False positive; package is built with -D_FORTIFY_SOURCE=2
-openssn: hardening-no-fortify-functions usr/games/openssn

Modified: packages/trunk/openssn/debian/patches/enable-build-hardening.patch
===================================================================
--- packages/trunk/openssn/debian/patches/enable-build-hardening.patch	2012-06-05 15:06:57 UTC (rev 13679)
+++ packages/trunk/openssn/debian/patches/enable-build-hardening.patch	2012-06-06 04:20:08 UTC (rev 13680)
@@ -1,6 +1,7 @@
-Description: Enable build hardening flags
+Description: Enable build hardening using dpkg-buildflags
+Forwarded: not-needed
 Author: Vincent Cheng <Vincentc1208 at gmail.com>
-Last-Update: 05-30-2012
+Last-Update: 2012-06-04
 
 --- a/src/Makefile
 +++ b/src/Makefile
@@ -8,11 +9,11 @@
  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 \
+-CFLAGS = -O2 -Wall `sdl-config --cflags` -Wno-write-strings \
++CFLAGS = -O2 -Wall `sdl-config --cflags` -Wno-write-strings `dpkg-buildflags --get CXXFLAGS` `dpkg-buildflags --get CPPFLAGS` \
  # -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
++LIBS = -lm -lSDL_gfx -lSDL_image -lSDL_mixer `sdl-config --libs` `dpkg-buildflags --get LDFLAGS`
  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-datadir-path.patch
===================================================================
--- packages/trunk/openssn/debian/patches/fix-datadir-path.patch	                        (rev 0)
+++ packages/trunk/openssn/debian/patches/fix-datadir-path.patch	2012-06-06 04:20:08 UTC (rev 13680)
@@ -0,0 +1,17 @@
+Description: Fix DATADIR path
+ On Debian systems, arch-independent game data should be installed in
+ /usr/share/games/<package> instead of directly in /usr/share.
+Forwarded: not-needed
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Last-Update: 2012-06-04
+
+--- 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.3
+ 

Deleted: packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch
===================================================================
--- packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch	2012-06-05 15:06:57 UTC (rev 13679)
+++ packages/trunk/openssn/debian/patches/fix-gcc47-ftbfs.patch	2012-06-06 04:20:08 UTC (rev 13680)
@@ -1,15 +0,0 @@
-Description: Fix FTBFS due to header dependency changes in gcc 4.7
- This patch fixes FTBFS by explicitly including unistd.h.
-Author: Vincent Cheng <Vincentc1208 at gmail.com>
-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>

Deleted: packages/trunk/openssn/debian/patches/fix-makefile-typo.patch
===================================================================
--- packages/trunk/openssn/debian/patches/fix-makefile-typo.patch	2012-06-05 15:06:57 UTC (rev 13679)
+++ packages/trunk/openssn/debian/patches/fix-makefile-typo.patch	2012-06-06 04:20:08 UTC (rev 13680)
@@ -1,26 +0,0 @@
-Description: Fix typo in Makefile
- The desktop menu entry should be placed in /usr/share/applications/, rather 
- than a subdir with the same name. Also, modify DATADIR path.
-Forwarded: yes
-Author: Vincent Cheng <Vincentc1208 at gmail.com>
-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
- 	cp openssn.png $(PREFIX)/share/pixmaps
--	cp openssn.desktop $(PREFIX)/share/applications/openssn.desktop
-+	cp openssn.desktop $(PREFIX)/share/applications
- 	cp openssn.6.gz $(PREFIX)/share/man/man6
- 
- optinstall: all

Modified: packages/trunk/openssn/debian/patches/series
===================================================================
--- packages/trunk/openssn/debian/patches/series	2012-06-05 15:06:57 UTC (rev 13679)
+++ packages/trunk/openssn/debian/patches/series	2012-06-06 04:20:08 UTC (rev 13680)
@@ -1,3 +1,2 @@
-fix-gcc47-ftbfs.patch
-fix-makefile-typo.patch
+fix-datadir-path.patch
 enable-build-hardening.patch