[feel++] 76/122: prepare for -11

[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 aef2f40fad5fad845048e7d8398e88e248011ffe
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Tue Apr 19 15:39:46 2011 +0000

    prepare for -11
---
 debian/changelog               |  8 ++++++++
 debian/control                 |  2 +-
 debian/patches/minconfig.patch | 18 +++++++++---------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc1e2c3..7ba4cfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+feel++ (0.90.0-11) unstable; urgency=low
+
+  * debian/control: b-d on libslepc3.0.0 for testing
+  * debian/patches: update minconf.patch to reduce even more the minimum
+    configuration
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Tue, 19 Apr 2011 17:17:06 +0200
+
 feel++ (0.90.0-10) unstable; urgency=low
 
   * debian/control: added texlive-latex-recommended to fix manual
diff --git a/debian/control b/debian/control
index e95c9b6..84bf65b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++ (>= 4.4), gfort
 	       libboost1.46-all-dev|libboost-all-dev, libboost-mpi1.46-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],
+	       libpetsc3.1-dev (>= 3.1.dfsg-3), libslepc3.1-dev[amd64 i386] | libslepc3.0.0-dev [amd64 i386],
 	       libhdf5-mpi-dev,
 	       libsuperlu3-dev, libsuitesparse-dev, libscotchmetis-dev,
 	       libgmm++-dev,
diff --git a/debian/patches/minconfig.patch b/debian/patches/minconfig.patch
index 7dbf46c..5896a91 100644
--- a/debian/patches/minconfig.patch
+++ b/debian/patches/minconfig.patch
@@ -5,21 +5,21 @@ Index: feel++-0.90.0/doc/tutorial/CMakeLists.txt
 @@ -80,7 +80,7 @@
   endforeach()
  endmacro()
- 
+
 -foreach( docex myapp myintegrals mymesh myfunctionspace laplacian residualestimator)
-+foreach( docex myapp mymesh)
++foreach( docex myapp )
    add_docex( ${docex} )
  endforeach()
- 
+
 @@ -100,7 +100,7 @@
- 
+
  if ( NOT FEEL_MINIMAL_CONFIGURATION )
- 
+
 -foreach( docex stokes bratu nonlinearpow )
-+foreach( docex  myintegrals myfunctionspace laplacian residualestimator stokes bratu nonlinearpow )
++foreach( docex  mymesh myintegrals myfunctionspace laplacian residualestimator stokes bratu nonlinearpow )
    add_docex( ${docex} )
  endforeach()
- 
+
 Index: feel++-0.90.0/CMakeLists.txt
 ===================================================================
 --- feel++-0.90.0.orig/CMakeLists.txt	2011-04-19 10:03:03.000000000 +0000
@@ -30,7 +30,7 @@ Index: feel++-0.90.0/CMakeLists.txt
    SET(FEEL_MESH_MAX_ORDER "1" CACHE STRING "maximum geometrical order in templates to instantiate" FORCE )
 +  add_definitions( -DFEEL_MINIMAL_CONFIGURATION=1 )
  ENDIF( FEEL_MINIMAL_CONFIGURATION )
- 
+
  #
 Index: feel++-0.90.0/doc/tutorial/myintegrals.cpp
 ===================================================================
@@ -48,6 +48,6 @@ Index: feel++-0.90.0/doc/tutorial/myintegrals.cpp
      app.add( new MyIntegrals<2>( app.vm(), app.about() ) );
      app.add( new MyIntegrals<3>( app.vm(), app.about() ) );
 +#endif
- 
+
      app.run();
  }

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