[SCM] transportation simulator branch, master, updated. debian/110.0.1-3

Ansgar Burchardt ansgar at debian.org
Thu May 5 22:16:11 UTC 2011


The following commit has been merged in the master branch:
commit f2e1fd77ecc1963313f9288cdd4a2f9429abbe13
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu May 5 22:15:08 2011 +0200

    Use hardening flags from hardening-includes.

diff --git a/debian/control b/debian/control
index b447f31..32baaad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at debian.org>, Clint Adams <clint at gnu.org>
-Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, imagemagick, libpng12-dev, libbz2-dev, libssl-dev, dpkg (>= 1.15.7)
+Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, imagemagick, libpng12-dev, libbz2-dev, libssl-dev, dpkg (>= 1.15.7), hardening-includes
 Standards-Version: 3.9.1
 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 5b6aef7..2e38559 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,11 @@ 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
+CFLAGS   += $(HARDENING_CFLAGS)
+CXXFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS  += $(HARDENING_LDFLAGS)
+
 build: build-stamp
 build-stamp:
 	dh build

-- 
transportation simulator



More information about the Pkg-games-commits mailing list