r36688 - in /packages/fenics/dolfin/trunk/debian: control rules

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

Author: johannr-guest
Date: Thu Jul  1 20:22:49 2010
New Revision: 36688

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36688
Log:
Allow both PETSc 3.0 and 3.1.

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

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=36688&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Thu Jul  1 20:22:49 2010
@@ -6,7 +6,7 @@
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-all-dev, 
  python-central (>= 0.5.6), scons, swig (>= 1.3.35), python-numpy, pkg-config,
  libxml2-dev, libboost-dev, libboost-serialization-dev, libsuitesparse-dev,
- python-ufc (>= 1.4.1-1), libptscotch-dev, libpetsc3.1-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),
  libboost-filesystem-dev, libboost-program-options-dev
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, 
@@ -28,7 +28,8 @@
 Depends: libdolfin0 (= ${binary:Version}), libxml2-dev, pkg-config,
  libboost-dev, libboost-program-options-dev, libboost-filesystem-dev,
  libboost-serialization-dev, libsuitesparse-dev, python-dev, python-numpy,
- libptscotch-dev, libpetsc3.1-dev, libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7),
+ libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
+ libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7),
  python-ufl (>= 0.5.3-1), ${misc:Depends}
 Description: Shared links and header files for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=36688&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Thu Jul  1 20:22:49 2010
@@ -31,7 +31,7 @@
 	enableUmfpack=1 \
 	enableTrilinos=0 \
 	enablePetsc=1 \
-	withPetscDir=/usr/lib/petscdir/3.1 \
+	withPetscDir=/usr/lib/petsc \
 	withPetscArch=`petscarch` \
 	enableSlepc=1 \
 	withSlepcDir=/usr/lib/slepcdir/3.0.0 \