[feel++] 106/122: revert back to g++-4.6, g++-4.7 is just too broken

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository feel++.

commit fbc80139f9d7a80f265b7fe8d25baec1dbf2f95c
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Sun Jun 10 22:28:41 2012 +0000

    revert back to g++-4.6, g++-4.7 is just too broken
---
 debian/changelog | 9 +++++++--
 debian/control   | 4 ++--
 debian/rules     | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a809650..bc79c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-feel++ (0.91.4-3) UNRELEASED; urgency=low
+feel++ (0.91.4-3) unstable; urgency=low
 
+  [Christophe Prud'homme]
+  * debian/control: update Standards-Version to 3.9.3 (no change)
+  * debian/rules: revert back to g++-4.6, g++-4.7 is too broken
+  
+  [Dmitrijs Ledkovs]
   * debian/control: remove alternative dependencies on libboost1.46-* in
     the libfeel++-dev package. BinNMUs can and have transitioned the
     package to boost1.49 by now, so the dependency should only be on the
     default boost packages. This will get the package 'unstuck' in the
     boost1.49 transition tracker.
 
- -- Dmitrijs Ledkovs <xnox at debian.org>  Sat, 09 Jun 2012 11:50:11 +0100
+ -- Christophe Prud'homme <prudhomm at debian.org>  Mon, 11 Jun 2012 00:26:41 +0200
 
 feel++ (0.91.4-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d47c61b..1f6b0dd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++ (>=4.5), gfortran (>=4.5),
+Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++-4.6, gfortran (>=4.5),
 	       libboost-all-dev, libboost-mpi-dev,
 	       mpi-default-dev[!hurd-i386], mpi-default-bin[!hurd-i386],
 	       libslepc3.2-dev|libslepc3.1-dev,
@@ -14,7 +14,7 @@ Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++ (>=4.5), gfortr
 	       transfig,imagemagick,
 	       libtbb-dev[amd64 i386],
 	       libopenturns-dev, libann-dev, libglpk-dev 
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.feelpp.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/feel++/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/feel++/trunk
diff --git a/debian/rules b/debian/rules
index 50d98e4..a4ca32a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+export CXX=/usr/bin/g++-4.6
 export CFLAGS=
 export CXXFLAGS=
 
@@ -21,6 +22,7 @@ FEELPP_INSTALL_ENABLERS=-DBUILD_TESTING=OFF                  \
                       -DFEELPP_MINIMAL_CONFIGURATION=ON
 
 DEB_CMAKE_EXTRA_FLAGS=                      \
+        -DCMAKE_CXX_COMPILER=/usr/bin/g++-4.6 \
         -DCMAKE_BUILD_TYPE=Release          \
 	-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0"  \
 	-DPETSC_ARCH=$(PETSC_ARCH)-c-opt        \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/feel++.git