[SCM] Standalone 3D Game Maker and 3D Game Design program branch, master, updated. debian/2.7.1+dfsg-1-4-g93ad8c3

Sun Jun 10 14:35:27 UTC 2012

The following commit has been merged in the master branch:
commit c6b4af089625a6fd27a74747ec27082afb41d8fa
Author: Scott Howard <showard at debian.org>
Date:   Sun Jun 10 01:10:40 2012 -0400

    used dpkg-buildflags for Wheezy hardening release goal

diff --git a/debian/changelog b/debian/changelog
index 9474d05..b594658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ sandboxgamemaker (2.7.1+dfsg-2) unstable; urgency=low
 
   * debian/patches/gcc4.7.patch
     - fixed FTBFS from gcc 4.7 transition (Closes: #673545)
+  * debian/patches/hardening.patch
+    - used dpkg-buildflags for Wheezy hardening release goal
 
- -- Scott Howard <showard at debian.org>  Sat, 09 Jun 2012 22:46:30 -0400
+ -- Scott Howard <showard at debian.org>  Sun, 10 Jun 2012 01:07:51 -0400
 
 sandboxgamemaker (2.7.1+dfsg-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index ddaa14a..61a5e18 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: contrib/games
 Priority: optional
 Maintainer: Scott Howard <showard at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libenet-dev (>= 1.3.1), po-debconf, libwxgtk2.8-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libenet-dev (>= 1.3.1), po-debconf, libwxgtk2.8-dev
+Standards-Version: 3.9.3
 Homepage: http://sandboxgamemaker.com/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/sandboxgamemaker.git
 Vcs-git: git://git.debian.org/git/pkg-games/sandboxgamemaker.git
diff --git a/debian/copyright b/debian/copyright
index 3bc5cdc..807edbc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Name: Platinum Arts Sandbox 3D Game Maker
 Maintainer: Mike Tomaino, Platinum Arts, LLC <PlatinumArts at gmail.com>
 Source: http://sandboxgamemaker.com/download-sandbox.html
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
index 3d6ac69..dc9e286 100644
--- a/debian/patches/gcc4.7.patch
+++ b/debian/patches/gcc4.7.patch
@@ -1,3 +1,6 @@
+Description: fixed FTBFS from gcc 4.7 transition
+Author: Scott Howard <showard at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673545
 Index: sandboxgamemaker/src/engine/skelmodel.h
 ===================================================================
 --- sandboxgamemaker.orig/src/engine/skelmodel.h	2011-10-03 20:55:39.504776564 -0400
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..b7e045b
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,67 @@
+Description: Enable hardening flags
+Author: Scott Howard <showard at debian.org>
+Index: sandboxgamemaker/src/Makefile
+===================================================================
+--- sandboxgamemaker.orig/src/Makefile	2012-06-09 23:37:59.000000000 -0400
++++ sandboxgamemaker/src/Makefile	2012-06-09 23:40:13.398702129 -0400
+@@ -2,8 +2,8 @@
+ DEFINES =
+ MACHINENAME=
+ CXXFLAGS= -O2 -fomit-frame-pointer $(DEFINES)
+-override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
+-
++override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti `dpkg-buildflags --get CXXFLAGS` `dpkg-buildflags --get CPPFLAGS`
++LDFLAGS= `dpkg-buildflags --get LDFLAGS`
+ PLATFORM= $(shell uname -s)
+ PLATFORM_PREFIX=sandbox
+ 
+@@ -219,7 +219,7 @@
+ $(LAUNCHER_OBJS): CXXFLAGS += $(LAUNCHER_FLAGS)
+ 
+ pasl:   $(LAUNCHER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o launch $(LAUNCHER_OBJS) $(LAUNCHER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o launch $(LAUNCHER_OBJS) $(LAUNCHER_LIBS)
+ 	cp launch ../sandboxgamemaker_glauncher
+ 	chmod +x ../sandboxgamemaker_glauncher
+ 
+@@ -309,31 +309,31 @@
+ else
+ 
+ client-fps: $(CLIENT_OBJS) $(FPSCLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_client_fps $(CLIENT_OBJS) $(FPSCLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_client_fps $(CLIENT_OBJS) $(FPSCLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ client-ssp: $(CLIENT_OBJS) $(SSPCLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_client_ssp $(CLIENT_OBJS) $(SSPCLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_client_ssp $(CLIENT_OBJS) $(SSPCLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ client-rpg: $(CLIENT_OBJS) $(RPGCLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_client_rpg $(CLIENT_OBJS) $(RPGCLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_client_rpg $(CLIENT_OBJS) $(RPGCLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ client-movie: $(CLIENT_OBJS) $(MOVIECLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_client_movie $(CLIENT_OBJS) $(MOVIECLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_client_movie $(CLIENT_OBJS) $(MOVIECLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ client-krs: $(CLIENT_OBJS) $(KRSCLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_client_krs $(CLIENT_OBJS) $(KRSCLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_client_krs $(CLIENT_OBJS) $(KRSCLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ client-pzl: $(CLIENT_OBJS) $(PZLCLIENT_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_client_pzl $(CLIENT_OBJS) $(PZLCLIENT_OBJS) $(CLIENT_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_client_pzl $(CLIENT_OBJS) $(PZLCLIENT_OBJS) $(CLIENT_LIBS)
+ 
+ server-fps:  $(SERVER_OBJS) $(FPSSERVER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_server_fps $(SERVER_OBJS) $(FPSSERVER_OBJS) $(SERVER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_server_fps $(SERVER_OBJS) $(FPSSERVER_OBJS) $(SERVER_LIBS)
+ 
+ server-movie:  $(SERVER_OBJS) $(MOVIESERVER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_server_movie $(SERVER_OBJS) $(MOVIESERVER_OBJS) $(SERVER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_server_movie $(SERVER_OBJS) $(MOVIESERVER_OBJS) $(SERVER_LIBS)
+ 
+ master: $(MASTER_OBJS)
+-	$(CXX) $(CXXFLAGS) -o $(PLATFORM_PREFIX)_master $(MASTER_OBJS) $(MASTER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PLATFORM_PREFIX)_master $(MASTER_OBJS) $(MASTER_LIBS)
+ 
+ 
+ install: all
diff --git a/debian/patches/series b/debian/patches/series
index f08c996..5a7091b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ wx_launcher_paths.patch
 debianizing_makefiles.patch
 linux_launcher.patch
 librt_linking.patch
+hardening.patch

-- 
Standalone 3D Game Maker and 3D Game Design program

