[feel++] 93/122: fix feel++

[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 2e049cc215abeecc6255b3b0fa484674b2f05721
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Mon Mar 12 06:15:44 2012 +0000

    fix feel++
---
 debian/changelog           |  8 ++++++--
 debian/control             |  8 ++++----
 debian/feel++-apps.install |  4 ++--
 debian/feel++-doc.install  |  2 +-
 debian/rules               | 16 +++++++++-------
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82c0150..c2a8c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-feel++ (0.91.0-1) UNRELEASED; urgency=low
+feel++ (0.91.0-1) unstable; urgency=low
 
   * New upstream release
+  * using gcc4.6 allows to reduce memory usage footprint (Closes: #650642).
+  * Feel++ uses now gcc4.6  (Closes: #654730).
+  * Feel++ uses now gcc4.6  (Closes: #654731).
+  * Feel++ uses now gcc4.6  (Closes: #654732).  
 
- -- Christophe Prud'homme <prudhomm at localhost>  Tue, 30 Aug 2011 10:24:07 +0200
+ -- Christophe Prud'homme <prudhomm at debian.org>  Sun, 11 Mar 2012 23:17:00 +0100
 
 feel++ (0.91.0~svn7215-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 99dc250..46b9138 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ 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.4),
+Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++ (>=4.5), gfortran (>=4.5),
 	       libboost-all-dev, libboost-mpi-dev,
 	       mpi-default-dev[!hurd-i386], mpi-default-bin[!hurd-i386],
 	       libtrilinos-dev[!armel !mips !mipsel !s390 !hppa !hurd-i386 !sparc],
-	       libpetsc3.1-dev (>= 3.1.dfsg-3), libslepc3.1-dev[amd64 i386] | libslepc3.0.0-dev [amd64 i386],
+	       libpetsc3.2-dev, libslepc3.2-dev,
 	       libhdf5-mpi-dev,
 	       libsuperlu3-dev, libsuitesparse-dev, libscotchmetis-dev,
 	       python-pyx, python-scipy,
@@ -16,7 +16,7 @@ Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++-4.5, gfortran (
                doxygen, doxygen-latex,
 	       transfig,imagemagick,
 	       libtbb-dev[amd64 i386],
-	       libopenturns-dev, openturns-wrapper, libann-dev, libglpk-dev, octave3.2-headers
+	       libopenturns-dev, openturns-wrapper, libann-dev, libglpk-dev 
 Standards-Version: 3.9.2
 Homepage: http://www.feelpp.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/feel++/trunk
@@ -67,7 +67,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libfeel++1 (= ${binary:Version}), libvtk5-dev, 
 	 libboost1.46-all-dev|libboost-all-dev, libboost-mpi1.46-dev |libboost-mpi-dev,
 	 mpi-default-dev, mpi-default-bin,
-         libtrilinos-dev, libpetsc3.1-dev (>= 3.1.dfsg-3), libslepc3.1-dev (>= 3.1) | libslepc3.0.0-dev (>= 3.0), libgmm++-dev,
+         libtrilinos-dev, libpetsc3.2-dev,  libslepc3.2-dev, libgmm++-dev,
          libsuperlu3-dev, libsuitesparse-dev, libscotchmetis-dev,
 	 libeigen2-dev, libvtk5-dev, libxml2-dev, libtbb-dev [amd64 i386],
          libopenturns-dev, openturns-wrapper, libann-dev, libglpk-dev, octave3.2-headers
diff --git a/debian/feel++-apps.install b/debian/feel++-apps.install
index f8685f0..de6add3 100644
--- a/debian/feel++-apps.install
+++ b/debian/feel++-apps.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/bin/*        /usr/bin
 debian/tmp/usr/share/*      /usr/share
-debian/tmp/usr/lib/openturns      /usr/lib
-debian/tmp/usr/lib/octave      /usr/lib
+#debian/tmp/usr/lib/openturns      /usr/lib
+#debian/tmp/usr/lib/octave      /usr/lib
diff --git a/debian/feel++-doc.install b/debian/feel++-doc.install
index 6de3daa..bd295fa 100644
--- a/debian/feel++-doc.install
+++ b/debian/feel++-doc.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/share/doc/feel/html              /usr/share/doc/feel++-doc/
 debian/tmp/usr/share/doc/feel/examples          /usr/share/doc/feel++-doc/
-debian/tmp/usr/bin/feel_get_tutorial            /usr/bin
+# debian/tmp/usr/bin/feel_get_tutorial            /usr/bin
diff --git a/debian/rules b/debian/rules
index 6c7a8ae..f05a0a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,19 +61,21 @@ endif
 DEB_CMAKE_EXTRA_FLAGS=                      \
         -DCMAKE_BUILD_TYPE=Release          \
 	-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0"  \
-	-DCMAKE_CXX_COMPILER=/usr/bin/g++-4.5\
 	-DPETSC_ARCH=$(PETSC_ARCH)-c-opt        \
-	-DPETSC_DIR=/usr/lib/petscdir/3.1 \
+	-DPETSC_DIR=/usr/lib/petscdir/3.2 \
 	-DPETSC_EXECUTABLE_RUNS=ON          \
-	-DFEEL_ENABLE_APPLICATIONS=OFF      \
-	-DFEEL_ENABLE_BENCHMARKS=OFF        \
-	-DFEEL_ENABLE_TESTS=OFF             \
-	-DFEEL_ENABLE_EXAMPLES=OFF          \
+	-DFEELPP_ENABLE_APPLICATIONS=OFF      \
+	-DFEELPP_ENABLE_APPLICATIONS_CRB=ON      \
+	-DFEELPP_ENABLE_BENCHMARKS=OFF        \
+	-DFEELPP_ENABLE_TESTS=OFF             \
+	-DFEELPP_ENABLE_EXAMPLES=OFF          \
 	-DFEELPP_OPUS_ENABLE_EADS=ON        \
 	${FEEL_MPI}                         \
 	${FEEL_INSTALL_ENABLERS}            \
 	-DTRILINOS_LIB_NOXLAPACK=           \
-        -DENABLE_INSTANTIATION_MODE=OFF
+	-DENABLE_INSTANTIATION_MODE=OFF \
+	$(CURDIR)/$(DEB_SRCDIR) 
+
 
 #build/feel++-apps::
 #	-cd $(DEB_BUILDDIR) && ctest -D Experimental

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