r36418 - in /packages/life/trunk/debian: patches/ patches/mindoc.patch patches/series rules

[prudhomm at users.alioth.debian.org]

Author: prudhomm
Date: Sun Apr 25 15:47:35 2010
New Revision: 36418

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36418
Log:
update package and try to fix powerpc build

Added:
    packages/life/trunk/debian/patches/
    packages/life/trunk/debian/patches/mindoc.patch
    packages/life/trunk/debian/patches/series
Modified:
    packages/life/trunk/debian/rules

Added: packages/life/trunk/debian/patches/mindoc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/life/trunk/debian/patches/mindoc.patch?rev=36418&op=file
==============================================================================
--- packages/life/trunk/debian/patches/mindoc.patch (added)
+++ packages/life/trunk/debian/patches/mindoc.patch Sun Apr 25 15:47:35 2010
@@ -1,0 +1,21 @@
+Index: life-0.9.23/doc/tutorial/CMakeLists.txt
+===================================================================
+--- life-0.9.23.orig/doc/tutorial/CMakeLists.txt	2010-04-23 12:38:03.000000000 +0200
++++ life-0.9.23/doc/tutorial/CMakeLists.txt	2010-04-23 12:39:09.000000000 +0200
+@@ -56,11 +56,12 @@
+  endforeach()
+ endmacro()
+ 
+-foreach( docex myapp mymesh myintegrals laplacian stokes bratu nonlinearpow )
++#foreach( docex myapp mymesh myintegrals laplacian stokes bratu nonlinearpow )
++foreach( docex myapp mymesh myintegrals laplacian  )
+   add_docex( ${docex} )
+ endforeach()
+ 
+ # Natural convection problem
+-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+-add_executable( life_doc_convection convection.hpp convection_other.cpp convection_main.cpp convection_run.cpp convection_residual.cpp convection_jacobian.cpp convection_jacobian1.cpp convection_jacobian2.cpp convection_lo.cpp convection_lo2.cpp )
+-target_link_libraries( life_doc_convection ${LIFE_LIBRARIES} )
++#include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
++#add_executable( life_doc_convection convection.hpp convection_other.cpp convection_main.cpp convection_run.cpp convection_residual.cpp convection_jacobian.cpp convection_jacobian1.cpp convection_jacobian2.cpp convection_lo.cpp convection_lo2.cpp )
++#target_link_libraries( life_doc_convection ${LIFE_LIBRARIES} )

Added: packages/life/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/life/trunk/debian/patches/series?rev=36418&op=file
==============================================================================
--- packages/life/trunk/debian/patches/series (added)
+++ packages/life/trunk/debian/patches/series Sun Apr 25 15:47:35 2010
@@ -1,0 +1,1 @@
+mindoc.patch

Modified: packages/life/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/life/trunk/debian/rules?rev=36418&op=diff
==============================================================================
--- packages/life/trunk/debian/rules (original)
+++ packages/life/trunk/debian/rules Sun Apr 25 15:47:35 2010
@@ -8,11 +8,14 @@
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifeq "$(DEB_BUILD_ARCH)" "amd64"
+ifeq "$(DEB_BUILD_ARCH)" "powerpc"
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 LIFE_INSTALL_ENABLERS=-DLIFE_ENABLE_ALL=OFF                \
-                       -DENABLE_INSTANTIATION_MODE=1
+                      -DBUILD_TESTING=OFF                  \
+                      -DLIFE_ENABLE_DOCUMENTATION=ON       \
+                      -DENABLE_INSTANTIATION_MODE=OFF
 else
- LIFE_INSTALL_ENABLERS=-DLIFE_ENABLE_ALL=OFF
+LIFE_INSTALL_ENABLERS=-DLIFE_ENABLE_ALL=ON 
 endif
 DEB_CMAKE_EXTRA_FLAGS=                      \
 	-DCMAKE_BUILD_TYPE=Release          \
@@ -22,8 +25,11 @@
 	${LIFE_INSTALL_ENABLERS}            \
 	-DTRILINOS_LIB_NOXLAPACK=
 
-build/life-apps::
-	-cd $(DEB_BUILDDIR) && ctest -D Experimental
+#build/life-apps::
+#	-cd $(DEB_BUILDDIR) && ctest -D Experimental
+
+build/liblife::
+	-cd $(DEB_BUILDDIR) && cmake ..
 
 binary-install/life-apps::
 	strip debian/life-apps/usr/bin/*