r45011 - in /packages/feel++/trunk/debian: changelog control rules

[prudhomm at users.alioth.debian.org]

Author: prudhomm
Date: Sun Jun 10 22:28:41 2012
New Revision: 45011

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45011
Log:
revert back to g++-4.6, g++-4.7 is just too broken

Modified:
    packages/feel++/trunk/debian/changelog
    packages/feel++/trunk/debian/control
    packages/feel++/trunk/debian/rules

Modified: packages/feel++/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/changelog?rev=45011&op=diff
==============================================================================
--- packages/feel++/trunk/debian/changelog (original)
+++ packages/feel++/trunk/debian/changelog Sun Jun 10 22:28:41 2012
@@ -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
 

Modified: packages/feel++/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/control?rev=45011&op=diff
==============================================================================
--- packages/feel++/trunk/debian/control (original)
+++ packages/feel++/trunk/debian/control Sun Jun 10 22:28:41 2012
@@ -3,7 +3,7 @@
 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 @@
 	       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

Modified: packages/feel++/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/rules?rev=45011&op=diff
==============================================================================
--- packages/feel++/trunk/debian/rules (original)
+++ packages/feel++/trunk/debian/rules Sun Jun 10 22:28:41 2012
@@ -8,6 +8,7 @@
 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 @@
                       -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        \