[dolfin] 01/01: Depends: libpetsc3.6-dev, libslepc3.6-dev.

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to branch master
in repository dolfin.

commit 61f3eedcbd6f5007ce44240557f4c60e2d353c53
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Jun 2 21:29:05 2016 +0800

    Depends: libpetsc3.6-dev, libslepc3.6-dev.
    
    Depends: libpetsc3.6-dev rather than petsc-dev.
    Likewise libslepc3.6-dev rather than slepc-dev, to match.
    
    dolfin 1.6 is not compatible with petsc 3.7 (different API).
    
    Specifically, Build-Depends:
     libpetsc3.6-dev (>= 3.6.4.dfsg1-2)
     libslepc3.6-dev (>= 3.6.3.dfsg1-6)
    in order to build with generic /usr/lib/{petsc,slepc}dir/3.6-real
    links.
---
 debian/changelog | 8 ++++++++
 debian/control   | 8 ++++----
 debian/rules     | 9 +++++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87ceae5..69bc00f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dolfin (1.6.0-5) UNRELEASED; urgency=medium
+
+  * Depends: libpetsc3.6-dev rather than petsc-dev.
+    Likewise libslepc3.6-dev.
+    dolfin 1.6 is not compatible with petsc 3.7.
+
+ -- Drew Parsons <dparsons at debian.org>  Thu, 02 Jun 2016 19:38:58 +0800
+
 dolfin (1.6.0-4) unstable; urgency=medium
 
   [ Mattia Rizzolo ]
diff --git a/debian/control b/debian/control
index 53e2d05..cdd34fa 100644
--- a/debian/control
+++ b/debian/control
@@ -28,13 +28,13 @@ Build-Depends:
  libvtk6-dev,
  libxml2-dev,
  mpi-default-dev,
- petsc-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libpetsc3.6-dev (>= 3.6.4.dfsg1-2) [!kfreebsd-amd64 !kfreebsd-i386],
+ libslepc3.6-dev (>= 3.6.3.dfsg1-6) [!kfreebsd-amd64 !kfreebsd-i386],
  pkg-config,
  python-dev,
  python-ffc (>= 1.6.0),
  python-numpy,
  python-ply,
- slepc-dev [!kfreebsd-amd64 !kfreebsd-i386],
  swig3.0 (>= 3.0.3)
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.7
@@ -64,9 +64,9 @@ Depends:
  libscotch-dev,
  libvtk6-dev,
  libxml2-dev,
- petsc-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libpetsc3.6-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libslepc3.6-dev [!kfreebsd-amd64 !kfreebsd-i386],
  pkg-config,
- slepc-dev [!kfreebsd-amd64 !kfreebsd-i386],
  ${misc:Depends}
 Conflicts:
  libdolfin0-dev,
diff --git a/debian/rules b/debian/rules
index eef0cf2..454b387 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,11 @@ USCAN_DESTDIR := $(CURDIR)
 PYVERS := $(shell pyversions --requested debian/control | tac -s' ')
 DEFAULT_PYVER := $(shell pyversions -d)
 
+PETSC_VERSION=3.6
+PETSC_DIR=/usr/lib/petscdir/$(PETSC_VERSION)-real
+# SLEPc version must match PETSc
+SLEPSC_DIR=/usr/lib/slepcdir/$(PETSC_VERSION)-real
+
 CMAKE_OPTS := \
 	-D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 	-D BUILD_SHARED_LIBS:BOOL=ON \
@@ -41,8 +46,8 @@ CMAKE_OPTS := \
 	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
 	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig \
 	-D DOLFIN_ENABLE_MPI:BOOL=$(ENABLE_MPI) \
-	-D PETSC_DIR:PATH=/usr/lib/petsc \
-	-D SLEPC_DIR:PATH=/usr/lib/slepc \
+	-D PETSC_DIR:PATH=$(PETSC_DIR) \
+	-D SLEPC_DIR:PATH=$(SLEPSC_DIR) \
 	-D DOLFIN_LIB_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH) \
 	-D DOLFIN_PKGCONFIG_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH)/pkgconfig \
 	$(DOLFIN_HOME)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/dolfin.git