r12319 - packages/trunk/btanks/debian
Ansgar Burchardt
ansgar at alioth.debian.org
Tue May 10 06:21:57 UTC 2011
Author: ansgar
Date: 2011-05-10 06:21:55 +0000 (Tue, 10 May 2011)
New Revision: 12319
Removed:
packages/trunk/btanks/debian/options.cache
Modified:
packages/trunk/btanks/debian/changelog
packages/trunk/btanks/debian/control
packages/trunk/btanks/debian/rules
Log:
Use dpkg-buildflags and hardening-includes to set compiler flags.
Modified: packages/trunk/btanks/debian/changelog
===================================================================
--- packages/trunk/btanks/debian/changelog 2011-05-10 00:46:50 UTC (rev 12318)
+++ packages/trunk/btanks/debian/changelog 2011-05-10 06:21:55 UTC (rev 12319)
@@ -2,6 +2,7 @@
* Fix FTBFS with gcc-4.6. (Closes: #624916)
+ new patch: gcc-4.6.patch
+ * Use dpkg-buildflags and hardening-includes to set compiler flags.
* debian/control: Use Breaks instead of Conflicts.
* Bump Standards-Version to 3.9.2.
* debian/control: Remove DM-Upload-Allowed.
Modified: packages/trunk/btanks/debian/control
===================================================================
--- packages/trunk/btanks/debian/control 2011-05-10 00:46:50 UTC (rev 12318)
+++ packages/trunk/btanks/debian/control 2011-05-10 06:21:55 UTC (rev 12319)
@@ -8,7 +8,7 @@
libsdl1.2-dev, libsdl-image1.2-dev, liblua5.1-dev,
libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
libsmpeg-dev, libvorbis-dev, libsigc++-2.0-dev, libexpat1-dev,
- python
+ dpkg (>= 1.15.7), hardening-includes, python
Standards-Version: 3.9.2
Homepage: http://btanks.sourceforge.net
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/btanks/
@@ -17,7 +17,7 @@
Package: btanks
Architecture: any
Depends: btanks-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: btanks-data (<< 0.9.8083-1)
+Breaks: btanks-data (<< 0.9.8083-1)
Description: fast 2D tank arcade game with multiplayer and split-screen modes
Battle Tanks is a funny battle on your desk, where you can choose one of
three vehicles and eliminate your enemy using the whole arsenal of
Deleted: packages/trunk/btanks/debian/options.cache
===================================================================
--- packages/trunk/btanks/debian/options.cache 2011-05-10 00:46:50 UTC (rev 12318)
+++ packages/trunk/btanks/debian/options.cache 2011-05-10 06:21:55 UTC (rev 12319)
@@ -1,4 +0,0 @@
-CC = 'gcc'
-CXX = 'g++'
-CCFLAGS = ' :CFLAGS: '
-CXXFLAGS = ' :CFLAGS: '
Modified: packages/trunk/btanks/debian/rules
===================================================================
--- packages/trunk/btanks/debian/rules 2011-05-10 00:46:50 UTC (rev 12318)
+++ packages/trunk/btanks/debian/rules 2011-05-10 06:21:55 UTC (rev 12319)
@@ -1,13 +1,19 @@
#!/usr/bin/make -f
-CFLAGS ?= -Wall -g
+export CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+include /usr/share/hardening-includes/hardening.make
+# does not work with shared libraries.
+DEB_BUILD_HARDENING_PIE := 0
+CFLAGS += $(HARDENING_CFLAGS)
+CXXFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS += $(HARDENING_LDFLAGS)
+
%:
dh $@
-override_dh_auto_configure:
- sed -e 's/:CFLAGS:/$(CFLAGS)/' < debian/options.cache > options.cache
-
override_dh_auto_build:
python engine/sl08/sl08.py >engine/sl08/sl08.h
scons prefix=/usr resources_dir=/usr/share/games/btanks plugins_dir=/usr/lib/btanks lib_dir=/usr/lib/btanks
More information about the Pkg-games-commits
mailing list