r44045 - in /packages/fenics/dolfin/trunk/debian: changelog control rules

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Tue Nov 22 08:45:37 2011
New Revision: 44045

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44045
Log:
Disable Trilinos support.

Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control
    packages/fenics/dolfin/trunk/debian/rules

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=44045&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Tue Nov 22 08:45:37 2011
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * debian/control: Update Homepage field.
+  * Disable Trilinos support (version >= 10.8.1 now required).
 
  -- Johannes Ring <johannr at simula.no>  Tue, 22 Nov 2011 09:36:53 +0100
 

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=44045&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Tue Nov 22 08:45:37 2011
@@ -24,8 +24,7 @@
  libptscotch-dev [!armel !mips !mipsel !s390 !sparc],
  libpetsc3.1-dev [!armel !hurd-i386 !mips !mipsel !s390 !sparc],
  libslepc3.1-dev [!armel !hurd-i386 !ia64 !mips !mipsel !s390 !sparc],
- libarmadillo-dev,
- libtrilinos-dev [!armel !hurd-i386 !mips !mipsel !s390 !sparc]
+ libarmadillo-dev
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.5
 Homepage: http://fenicsproject.org
@@ -52,7 +51,6 @@
  libslepc3.1-dev [!armel !hurd-i386 !ia64 !mips !mipsel !s390 !sparc],
  libarmadillo-dev,
  cmake (>= 2.8.0),
- libtrilinos-dev [!armel !hurd-i386 !mips !mipsel !s390 !sparc],
  ufc (>= 2.0.3),
  python-ufc (>= 2.0.3),
  ${misc:Depends}
@@ -111,7 +109,6 @@
  python-ufl (>= 1.0-beta3),
  python-instant (>= 1.0-beta),
  python-numpy,
- python-pytrilinos [!armel !hurd-i386 !mips !mipsel !s390 !sparc],
  swig2.0,
  ${python:Depends},
  ${shlibs:Depends},

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=44045&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Tue Nov 22 08:45:37 2011
@@ -29,8 +29,7 @@
 	-D BUILD_SHARED_LIBS:BOOL=ON \
 	-D CMAKE_SKIP_RPATH:BOOL=ON \
 	-D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
-	-D DOLFIN_ENABLE_TRILINOS:BOOL=ON \
-	-D Trilinos_DIR:PATH=/usr/include/trilinos \
+	-D DOLFIN_ENABLE_TRILINOS:BOOL=OFF \
 	-D DOLFIN_ENABLE_CGAL:BOOL=OFF \
 	-D DOLFIN_ENABLE_MTL4:BOOL=OFF \
 	-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \