[SCM] Packaging for getfem++ branch, master, updated. upstream/4.1.1-27-gda2d323

[Anton Gladky]

The following commit has been merged in the master branch:
commit da2d323e170d3349ce70629456a7bf34dd0eb74a
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Apr 20 21:58:29 2012 +0200

    Fix FTBFS with gcc-4.7. Thanks to Philipp Büttgenbach. (Closes: #669635)

diff --git a/debian/patches/fix-gcc-4.7-ftbfs.patch b/debian/patches/fix-gcc-4.7-ftbfs.patch
new file mode 100644
index 0000000..19eafaf
--- /dev/null
+++ b/debian/patches/fix-gcc-4.7-ftbfs.patch
@@ -0,0 +1,43 @@
+Description: fix FTBFS with gcc-4.7
+Author: Philipp Büttgenbach <Philipp.Buettgenbach at gmx.de>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-04-20
+
+--- a/src/gmm/gmm_except.h
++++ b/src/gmm/gmm_except.h
+@@ -76,7 +76,7 @@
+   }
+ # define GMM_THROW_(type, errormsg) {					\
+     std::stringstream msg;						\
+-    msg << "Error in "__FILE__ << ", line "				\
++    msg << "Error in " << __FILE__ << ", line "				\
+ 	<< __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n"		\
+ 	<< errormsg << ends;						\
+     throw (type)(msg.str());						\
+@@ -91,7 +91,7 @@
+   }
+ # define GMM_THROW_(type, errormsg) {					\
+     std::stringstream msg;						\
+-    msg << "Error in "__FILE__ << ", line "				\
++    msg << "Error in " << __FILE__ << ", line "				\
+ 	<< __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n"		\
+ 	<< errormsg   << ends;						\
+     ::abort();								\
+@@ -148,7 +148,7 @@
+ 
+ #define GMM_WARNING_MSG(level_, thestr)  {			       \
+       std::stringstream msg;                                           \
+-      msg << "Level " << level_ << " Warning in "__FILE__ << ", line " \
++      msg << "Level " << level_ << " Warning in " << __FILE__ << ", line " \
+           << __LINE__ << ": " << thestr << ends;		       \
+        std::cerr << msg.str() << std::endl;                            \
+     }
+@@ -210,7 +210,7 @@
+ #define GMM_TRACE_MSG(level_, thestr)  {			       \
+     GMM_TRACE_MSG_MPI {						       \
+       std::stringstream msg;                                           \
+-      msg << "Trace " << level_ << " in "__FILE__ << ", line "         \
++      msg << "Trace " << level_ << " in " << __FILE__ << ", line "         \
+           << __LINE__ << ": " << thestr				       \
+           << ends;						       \
+       std::cout << msg.str() << std::endl;			       \
diff --git a/debian/patches/series b/debian/patches/series
index 4483003..1893d9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-mumps-checks-configure.patch
 disableXaccess.diff
 addgetfempath.diff
 ld-no-add-needed.patch
+fix-gcc-4.7-ftbfs.patch

-- 
Packaging for getfem++