The following commit has been merged in the master branch:
commit da710cc1b66efb586c969e81afc441bd1a9f9206
Author: Ansgar Burchardt <[email protected]>
Date: Sat Mar 10 19:04:36 2012 +0100
Stop using hardening-includes as dpkg-buildflags sets hardening options now.
diff --git a/debian/control b/debian/control
index 6b45920..c20815a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: extra
Maintainer: Debian Games Team <[email protected]>
Uploaders: Ansgar Burchardt <[email protected]>, Clint Adams <[email protected]>
-Build-Depends: debhelper (>= 9), libsdl1.2-dev, libsdl-mixer1.2-dev,
zlib1g-dev, imagemagick, libpng-dev, libbz2-dev, libssl-dev, dpkg (>= 1.15.7),
hardening-includes
+Build-Depends: debhelper (>= 9), libsdl1.2-dev, libsdl-mixer1.2-dev,
zlib1g-dev, imagemagick, libpng-dev, libbz2-dev, libssl-dev, dpkg (>= 1.15.7)
Standards-Version: 3.9.2
Homepage: http://www.simutrans.com/
Vcs-Git: git://git.debian.org/git/pkg-games/simutrans.git
diff --git a/debian/rules b/debian/rules
index ba57dfa..20e4cc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,12 @@
#export DH_VERBOSE=1
#export VERBOSE = 1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
export CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
export CCFLAGS = $(CFLAGS)
export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-include /usr/share/hardening-includes/hardening.make
-CFLAGS += $(HARDENING_CFLAGS)
-CXXFLAGS += $(HARDENING_CFLAGS)
-LDFLAGS += $(HARDENING_LDFLAGS)
-
TARGETS := binary binary-arch binary-indep build build-arch build-indep clean
.PHONY: $(TARGETS)
$(TARGETS):
--
transportation simulator
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
