[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, master, updated. upstream/1.0.3-41-g2d9d50b

[Andreas Tille]

The following commit has been merged in the master branch:
commit f02fba88748d705dafa11bae589e5dffd888e06f
Author: Andreas Tille <tille at debian.org>
Date:   Fri May 11 08:11:30 2012 +0200

    Apply patch from Matthias Klose

diff --git a/debian/changelog b/debian/changelog
index 8110ce9..ddb6c88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sitplus (1.0.3-2) UNRELEASED; urgency=low
+
+  * Work around build failure with GCC 4.7. (Thanks for the patch to
+    Matthias Klose <doko at debian.org>
+    Closes: #672033.
+
+ -- Andreas Tille <tille at debian.org>  Fri, 11 May 2012 08:03:06 +0200
+
 sitplus (1.0.3-1) unstable; urgency=low
 
   [ Andreas Tille ]
diff --git a/debian/rules b/debian/rules
index 0febb38..6921534 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -fpermissive
+
 override_dh_auto_configure:
-	dh_auto_configure -- \
+	CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \
 	    -DCMAKE_BUILD_TYPE=Release \
 	    -DCMAKE_INSTALL_RPATH=/usr/lib/sitplus \
 	    -DCMAKE_EXE_LINKER_FLAGS="-lboost_system -lopencv_core -lopencv_highgui" \

-- 
Free software framework for ludic-therapeutic activities