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

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

Author: johannr-guest
Date: Fri Jul  2 12:02:37 2010
New Revision: 36703

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36703
Log:
Enable building with Trilinos.

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=36703&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Fri Jul  2 12:02:37 2010
@@ -12,9 +12,10 @@
   * Allow building against either version 3.0.0 or 3.1 of PETSc. 
   * Remove patches (added upstream).
   * Switch to dpkg-source 3.0 (quilt) format.
-  * Update debian/copyright and debian/copyright_hints
+  * Update debian/copyright and debian/copyright_hints.
+  * Enable Trilinos support.
 
- -- Johannes Ring <johannr at simula.no>  Thu, 01 Jul 2010 21:43:51 +0200
+ -- Johannes Ring <johannr at simula.no>  Fri, 02 Jul 2010 13:24:21 +0200
 
 dolfin (0.9.7-5) unstable; urgency=low
 

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=36703&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Fri Jul  2 12:02:37 2010
@@ -8,7 +8,8 @@
  libxml2-dev, libboost-dev, libboost-serialization-dev, libsuitesparse-dev,
  python-ufc (>= 1.4.1-1), libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
  libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7), libarmadillo-dev,
- libboost-filesystem-dev, libboost-program-options-dev
+ libboost-filesystem-dev, libboost-program-options-dev,
+ libtrilinos-dev
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, 
  texlive-math-extra, ghostscript
 Standards-Version: 3.8.4
@@ -30,7 +31,7 @@
  libboost-serialization-dev, libsuitesparse-dev, python-dev, python-numpy,
  libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
  libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7), libarmadillo-dev,
- python-ufl (>= 0.5.3-1), ${misc:Depends}
+ python-ufl (>= 0.5.3-1), libtrilinos-dev, ${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,8 +86,8 @@
 Conflicts: python-pydolfin0
 Replaces: python-pydolfin0
 Depends: libdolfin0-dev (= ${binary:Version}),
- libdolfin0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends},
- ${misc:Depends}
+ libdolfin0 (= ${binary:Version}), python-pytrilinos,
+ ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: python-pydolfin0, ${python:Provides}
 Suggests: dolfin-doc
 Description: Python interface for DOLFIN

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=36703&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Fri Jul  2 12:02:37 2010
@@ -28,7 +28,7 @@
 	prefix=/usr \
 	enableMpi=1 \
 	enableUmfpack=1 \
-	enableTrilinos=0 \
+	enableTrilinos=1 \
 	enablePetsc=1 \
 	withPetscDir=/usr/lib/petsc \
 	withPetscArch=`petscarch` \