[Pkg-scicomp-commits] fenics/dolfin/trunk/debian

[Johannes Ring]

SVN commit 4852 by johannr-guest:

Disable building with Trilinos.

 M  +6 -0      fenics/dolfin/trunk/debian/changelog  
 M  +3 -4      fenics/dolfin/trunk/debian/control  
 M  +1 -1      fenics/dolfin/trunk/debian/rules  


--- fenics/dolfin/trunk/debian/changelog #4851:4852
@@ -1,3 +1,9 @@
+dolfin (0.9.6-2) unstable; urgency=low
+
+  * Disable support for Trilinos for now.
+
+ -- Johannes Ring <johannr at simula.no>  Sat, 13 Feb 2010 09:55:48 +0100
+
 dolfin (0.9.6-1) unstable; urgency=low
 
   * New upstream release.
--- fenics/dolfin/trunk/debian/control #4851:4852
@@ -7,8 +7,7 @@
  python-central (>= 0.5.6), scons, swig (>= 1.3.35), python-numpy, libgts-dev,
  libxml2-dev, libboost-dev, libboost-serialization-dev, libsuitesparse-dev,
  python-ufc (>= 1.2.0), libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev,
- libboost-filesystem-dev, libboost-program-options-dev, libtrilinos-dev,
- python-pytrilinos
+ libboost-filesystem-dev, libboost-program-options-dev
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, 
  texlive-math-extra, ghostscript
 Standards-Version: 3.8.4
@@ -29,7 +28,7 @@
  libboost-dev, libboost-program-options-dev, libboost-filesystem-dev,
  libboost-serialization-dev, libsuitesparse-dev, python-dev, python-numpy,
  libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev, python-ufl,
- libtrilinos-dev, ${misc:Depends}
+ ${misc:Depends}
 Description: Shared links and header files for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
  (Problem Solving Environment) for ordinary and partial differential equations.
@@ -85,7 +84,7 @@
 Replaces: python-dolfin
 Depends: libdolfin0-dev (= ${binary:Version}),
  libdolfin0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends},
- ${misc:Depends}, python-pytrilinos
+ ${misc:Depends}
 Provides: ${python:Provides}
 Suggests: dolfin-doc
 Description: Python interface for DOLFIN
--- fenics/dolfin/trunk/debian/rules #4851:4852
@@ -24,7 +24,7 @@
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
 DEB_SCONS_BUILD_OPTIONS = configure prefix=/usr enableMpi=1 \
-	enableUmfpack=1 enableGts=1 enableTrilinos=1 enablePetsc=1 \
+	enableUmfpack=1 enableGts=1 enableTrilinos=0 enablePetsc=1 \
 	withPetscDir=/usr/lib/petscdir/3.0.0 withPetscArch=`petscarch` \
 	enableSlepc=1 withSlepcDir=/usr/lib/slepcdir/3.0.0 enableScotch=1 \
 	enableDocs=0 enableDemos=0 enableTests=0 enablePython=1 \