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

[Johannes Ring]

SVN commit 4545 by johannr-guest:

Enable Trilinos support and fix bug #540118.


 M  +15 -0     fenics/dolfin/trunk/debian/changelog  
 M  +5 -5      fenics/dolfin/trunk/debian/control  
 A             fenics/dolfin/trunk/debian/patches/trilinos.patch  
 M  +2 -2      fenics/dolfin/trunk/debian/rules  


--- fenics/dolfin/trunk/debian/changelog #4544:4545
@@ -1,3 +1,18 @@
+dolfin (0.9.2-2) unstable; urgency=low
+
+  * debian/control: 
+    - add build-dependency on libtrilinos-dev and
+      libboost-serialization-dev (closes: #540118). 
+    - add libtrilinos-dev to Depends field for -dev package.
+    - add python-pytrilinos to Depends field for python- package.
+    - change -dbg package section to debug (removes lintian warning).
+    - update Standard-Version to 3.8.2.
+  * debian/rules: enable building against Trilinos.
+  * debian/patches: add patch for build system to find Trilinos (taken
+    from upstream development repository).
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 10 Aug 2009 16:03:52 +0200
+
 dolfin (0.9.2-1) unstable; urgency=low
 
   * Initial release (Closes: #503082)
--- fenics/dolfin/trunk/debian/control #4544:4545
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Johannes Ring <johannr at simula.no>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), python-all-dev, python-central (>= 0.5.6), scons, swig (>= 1.3.35), python-numpy, libgts-dev, libxml2-dev, libboost-dev, libsuitesparse-dev, python-ufc (>= 1.1.1), libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), python-all-dev, 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.1.1), libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev, libtrilinos-dev
+Standards-Version: 3.8.2
 XS-Python-Version: >= 2.5
 Homepage: http://www.fenics.org/wiki/DOLFIN
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/fenics/dolfin/trunk/
@@ -17,7 +17,7 @@
 Conflicts: libdolfin-dev
 Replaces: libdolfin-dev
 Provides: libdolfin-dev
-Depends: libdolfin0 (= ${binary:Version}), libgts-dev, libxml2-dev, libboost-dev, libsuitesparse-dev, python-dev, python-numpy, libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev, python-ufl, ${misc:Depends}
+Depends: libdolfin0 (= ${binary:Version}), libgts-dev, libxml2-dev, libboost-dev, libsuitesparse-dev, python-dev, python-numpy, libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev, libtrilinos-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.
@@ -50,7 +50,7 @@
  This package contains the dynamic libraries.
 
 Package: libdolfin0-dbg
-Section: libdevel
+Section: debug
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Conflicts: libdolfin-dbg
@@ -69,7 +69,7 @@
 XB-Python-Version: ${python:Versions}
 Conflicts: python-dolfin
 Replaces: python-dolfin
-Depends: libdolfin0-dev (= ${binary:Version}), libdolfin0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: python-pytrilinos, libdolfin0-dev (= ${binary:Version}), libdolfin0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Suggests: dolfin-doc
 Description: C++/Python library for solving differential equations
--- fenics/dolfin/trunk/debian/rules #4544:4545
@@ -27,9 +27,9 @@
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
 DEB_SCONS_BUILD_OPTIONS = $(NJOBS) enableMpi=1 enableUmfpack=1 enableGts=1 \
-	enablePetsc=1 withPetscDir=/usr/lib/petsc enableTrilinos=0 \
+	enablePetsc=1 withPetscDir=/usr/lib/petsc enableTrilinos=1 \
 	enableSlepc=1 withSlepcDir=/usr/lib/slepc enableScotch=1 \
-	enableDocs=0 enableDemos=0 enableTests=0 enablePydolfin=1
+	enableDocs=0 enableDemos=0 enableTests=0 enablePython=1
 
 DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(DEB_DESTDIR)