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

[Johannes Ring]

SVN commit 4646 by johannr-guest:

Remove temporary support for Trilinos.

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


--- fenics/dolfin/trunk/debian/changelog #4645:4646
@@ -16,6 +16,7 @@
     - Build documentation.
   * Update debian/copyright.
   * Remove old patches (now included upstream).
+  * Remove (temporary) support for Trilinos because of #529807.
 
  -- Johannes Ring <johannr at simula.no>  Mon, 28 Sep 2009 09:21:05 +0200
 
--- fenics/dolfin/trunk/debian/control #4645:4646
@@ -7,7 +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,
- libtrilinos-dev, libboost-filesystem-dev, libboost-program-options-dev
+ libboost-filesystem-dev, libboost-program-options-dev
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, 
  texlive-math-extra, ghostscript
 Standards-Version: 3.8.3
@@ -27,8 +27,8 @@
 Depends: libdolfin0 (= ${binary:Version}), libgts-dev, libxml2-dev,
  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, libtrilinos-dev,
- python-ufl, ${misc:Depends}
+ libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev, python-ufl,
+ ${misc:Depends}
 Description: C++/Python library for solving differential equations 
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
  (Problem Solving Environment) for ordinary and partial differential equations.
@@ -81,7 +81,7 @@
 XB-Python-Version: ${python:Versions}
 Conflicts: python-dolfin
 Replaces: python-dolfin
-Depends: python-pytrilinos, libdolfin0-dev (= ${binary:Version}),
+Depends: libdolfin0-dev (= ${binary:Version}),
  libdolfin0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${python:Provides}
--- fenics/dolfin/trunk/debian/rules #4645:4646
@@ -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/petsc withPetscArch=`petscarch` \
 	enableSlepc=1 withSlepcDir=/usr/lib/slepc enableScotch=1 \
 	enableDocs=0 enableDemos=0 enableTests=0 enablePython=1