[feel++] 77/122: fix feel++ apps install

[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 c3487979fcba5bf7ccd005ffae99e763eef93e82
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Tue Apr 19 16:21:33 2011 +0000

    fix feel++ apps install
---
 debian/feel++-apps.install     |  7 +------
 debian/patches/minconfig.patch | 47 ++++++++++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/debian/feel++-apps.install b/debian/feel++-apps.install
index 5e0f8c1..dfbc81d 100644
--- a/debian/feel++-apps.install
+++ b/debian/feel++-apps.install
@@ -1,6 +1 @@
-debian/tmp/usr/bin/feel_doc_myapp        /usr/bin
-debian/tmp/usr/bin/feel_doc_mymesh       /usr/bin
-debian/tmp/usr/bin/feel_doc_myintegrals  /usr/bin
-#debian/tmp/usr/bin/feel_doc_myfunctionspace   /usr/bin
-#debian/tmp/usr/bin/feel_doc_laplacian         /usr/bin
-#debian/tmp/usr/bin/feel_doc_residualestimator /usr/bin
+debian/tmp/usr/bin/feel_doc_*        /usr/bin
diff --git a/debian/patches/minconfig.patch b/debian/patches/minconfig.patch
index 5896a91..e077b80 100644
--- a/debian/patches/minconfig.patch
+++ b/debian/patches/minconfig.patch
@@ -1,41 +1,58 @@
 Index: feel++-0.90.0/doc/tutorial/CMakeLists.txt
 ===================================================================
---- feel++-0.90.0.orig/doc/tutorial/CMakeLists.txt	2011-04-19 10:03:03.000000000 +0000
-+++ feel++-0.90.0/doc/tutorial/CMakeLists.txt	2011-04-19 10:03:50.000000000 +0000
-@@ -80,7 +80,7 @@
+--- feel++-0.90.0.orig/doc/tutorial/CMakeLists.txt	2011-04-19 18:18:53.000000000 +0200
++++ feel++-0.90.0/doc/tutorial/CMakeLists.txt	2011-04-19 18:19:52.000000000 +0200
+@@ -80,14 +80,10 @@
   endforeach()
  endmacro()
-
+ 
 -foreach( docex myapp myintegrals mymesh myfunctionspace laplacian residualestimator)
 +foreach( docex myapp )
    add_docex( ${docex} )
  endforeach()
-
-@@ -100,7 +100,7 @@
-
+ 
+-set(FEEL_INSTALL_APPS ${FEEL_INSTALL_APPS};${LIST_APPS} PARENT_SCOPE)
+-message(STATUS "doc tutorial: ${LIST_APPS}")
+-
+-
+ add_custom_target(
+   tut-prerequisites
+   ALL
+@@ -100,7 +96,7 @@
+ 
  if ( NOT FEEL_MINIMAL_CONFIGURATION )
-
+ 
 -foreach( docex stokes bratu nonlinearpow )
 +foreach( docex  mymesh myintegrals myfunctionspace laplacian residualestimator stokes bratu nonlinearpow )
    add_docex( ${docex} )
  endforeach()
-
+ 
+@@ -111,6 +107,9 @@
+ 
+ endif ( NOT FEEL_MINIMAL_CONFIGURATION )
+ 
++set(FEEL_INSTALL_APPS ${FEEL_INSTALL_APPS};${LIST_APPS} PARENT_SCOPE)
++message(STATUS "doc tutorial: ${LIST_APPS}")
++
+ IF ( OCTAVE_FOUND )
+ 
+ GET_DIRECTORY_PROPERTY(cmake_include_directories INCLUDE_DIRECTORIES)
 Index: feel++-0.90.0/CMakeLists.txt
 ===================================================================
---- feel++-0.90.0.orig/CMakeLists.txt	2011-04-19 10:03:03.000000000 +0000
-+++ feel++-0.90.0/CMakeLists.txt	2011-04-19 10:03:10.000000000 +0000
+--- feel++-0.90.0.orig/CMakeLists.txt	2011-04-19 18:18:53.000000000 +0200
++++ feel++-0.90.0/CMakeLists.txt	2011-04-19 18:19:04.000000000 +0200
 @@ -214,6 +214,7 @@
    set( ENABLE_INSTANTIATION_MODE OFF )
    UNSET( FEEL_INSTANTIATION_MODE CACHE )
    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
 ===================================================================
---- feel++-0.90.0.orig/doc/tutorial/myintegrals.cpp	2011-04-19 10:03:02.000000000 +0000
-+++ feel++-0.90.0/doc/tutorial/myintegrals.cpp	2011-04-19 10:03:10.000000000 +0000
+--- feel++-0.90.0.orig/doc/tutorial/myintegrals.cpp	2011-04-19 18:18:53.000000000 +0200
++++ feel++-0.90.0/doc/tutorial/myintegrals.cpp	2011-04-19 18:19:04.000000000 +0200
 @@ -248,10 +248,13 @@
          std::cout << app.optionsDescription() << "\n";
          return 0;
@@ -48,6 +65,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