diff -Nru dolfin-1.6.0/debian/changelog dolfin-1.6.0/debian/changelog --- dolfin-1.6.0/debian/changelog 2016-04-26 16:03:29.000000000 +0000 +++ dolfin-1.6.0/debian/changelog 2016-06-07 01:13:15.000000000 +0000 @@ -1,3 +1,11 @@ +dolfin (1.6.0-5) unstable; 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 Tue, 07 Jun 2016 09:11:42 +0800 + dolfin (1.6.0-4) unstable; urgency=medium [ Mattia Rizzolo ] diff -Nru dolfin-1.6.0/debian/control dolfin-1.6.0/debian/control --- dolfin-1.6.0/debian/control 2016-04-26 16:03:29.000000000 +0000 +++ dolfin-1.6.0/debian/control 2016-06-07 01:13:15.000000000 +0000 @@ -28,13 +28,13 @@ 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 @@ 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 -Nru dolfin-1.6.0/debian/rules dolfin-1.6.0/debian/rules --- dolfin-1.6.0/debian/rules 2016-04-26 16:03:29.000000000 +0000 +++ dolfin-1.6.0/debian/rules 2016-06-07 01:13:15.000000000 +0000 @@ -20,6 +20,11 @@ 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 @@ -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)