[SCM] advanced 3D real time strategy game engine branch, experimental, updated. debian/85.0+dfsg1-3-22-gf6d655e

[Jan Dittberner]

The following commit has been merged in the experimental branch:
commit f6d655e665cbd56e08fbb7680f8300b76ba6be14
Author: Jan Dittberner <jandd at debian.org>
Date:   Thu Jul 12 20:40:52 2012 +0200

    releasing version 89.0+dfsg1-1

diff --git a/debian/changelog b/debian/changelog
index 8facd50..cb46c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,13 @@ spring (89.0+dfsg1-1) experimental; urgency=low
   * Thanks to Matthias Klose for the NMU.
   * refresh debian/patches/0005-fix-sdl-build.patch
 
- -- Jan Dittberner <jandd at debian.org>  Wed, 11 Jul 2012 23:04:18 +0200
+ -- Jan Dittberner <jandd at debian.org>  Thu, 12 Jul 2012 20:40:27 +0200
 
 spring (88.0+dfsg1-1.1) unstable; urgency=low
 
-   * Non maintainer upload
-   * Work around build failure with GCC 4.7, build with -fpermissive.
-     Closes: #667379.
+  * Non maintainer upload
+  * Work around build failure with GCC 4.7, build with -fpermissive.
+    Closes: #667379.
 
  -- Matthias Klose <doko at debian.org>  Thu, 10 May 2012 20:41:35 +0200
 
diff --git a/debian/rules b/debian/rules
index f3a0177..3a71e8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
   export CMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt
 else
   export CC=gcc
-  export CXX=g++
+  export CXX=g++ -fpermissive
 endif
 
 # CPU type

-- 
advanced 3D real time strategy game engine