[SCM] Worms style game branch, master, updated. debian/0.9.18-0.3-8-g5d29a54

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 0980d9c8fc1cf3408425abcd2bbed42befdb111c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu May 23 18:15:40 2013 +0200

    Fix for armhf build failure

diff --git a/debian/changelog b/debian/changelog
index b3eb5fb..0e17031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+hedgewars (0.9.18-0.4) experimental; urgency=low
+
+  * Bumped compat version to 8
+  * Added some deps and build-deps on control file
+  * Removed some check in control file (higher versions
+    already in oldstable)
+  * Enabled hardening flags.
+  * Fixed armhf and powerpc build failure with libc 2.17
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 03 May 2013 10:31:44 +0200
+
 hedgewars (0.9.18-0.3) experimental; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/rules b/debian/rules
index fa98afb..9821d70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,27 @@
 #!/usr/bin/make -f
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_HOST_GNU_TYPE), powerpc-linux-gnu)
+   TYPE_FLAGS = -DFPFLAGS="-k/lib/powerpc-linux-gnu/libgcc_s.so.1"
+endif
+
+ifeq ($(DEB_HOST_GNU_TYPE), arm-linux-gnueabihf)
+   TYPE_FLAGS = -DFPFLAGS="-k/lib/arm-linux-gnueabihf/libgcc_s.so.1"
+endif
 
 DEB_CMAKE_INSTALL_PREFIX := /usr/lib/hedgewars
 DEB_CMAKE_EXTRA_FLAGS      := -DNOSERVER=0 \
-	-DDATA_INSTALL_DIR=/usr/share/games
+	-DDATA_INSTALL_DIR=/usr/share/games $(TYPE_FLAGS)
 # Leftover file in upstream tarball
 DEB_CLEAN_EXCLUDE := QTfrontend/main.cpp.orig
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+CFLAGS+=$(CPPFLAGS)
+CXXFLAGS+=$(CPPFLAGS)
+
 
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog \
 	|grep ^Version|awk '{print $$2}'|sed 's/-[[:digit:]]\+$$//' \

-- 
Worms style game