[dolfin] 01/02: Dolfin depends on specific patch releases of PETSc and SLEPc.

[Drew Parsons]

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

dparsons pushed a commit to tag debian/2016.2.0-2
in repository dolfin.

commit 6ba611615823295afe6670fcdd2303c130534336
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Jan 24 06:14:01 2017 +0800

    Dolfin depends on specific patch releases of PETSc and SLEPc.
    
    PETSC_DIR, SLEPC_DIR are set to the generic minor version (3.7), but
    dolfin extracts the specific patch versions 3.7.X for each.
    
    see /usr/lib/x86_64-linux-gnu/pkgconfig/dolfin.pc
        /usr/share/dolfin/cmake/DOLFINConfig.cmake
---
 debian/changelog |  7 +++++++
 debian/rules     | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51626d3..9fffa76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dolfin (2016.2.0-2) UNRELEASED; urgency=medium
+
+  * Dolfin depends on specific 3.7.X patch releases of PETSc and SLEPc
+    (see dolfin.pc, DOLFINConfig.cmake)
+
+ -- Drew Parsons <dparsons at debian.org>  Tue, 24 Jan 2017 06:12:31 +0800
+
 dolfin (2016.2.0-1) unstable; urgency=medium
 
   [ Drew Parsons ]
diff --git a/debian/rules b/debian/rules
index 253b8b5..ae619a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,8 @@ DEFAULT_PYVER := $(shell pyversions -d)
 
 # extract PETSc version from petsc-dev
 PETSC_DEB_VERSION=$(shell dpkg -s petsc-dev | awk '/Version:/ {print $2}')
-# extract the current PETSc version (drop epoch and debian package version)
-PETSC_UPSTREAM_VERSION=$(shell echo $(PETSC_DEB_VERSION) | sed "s/^.[^:]*://; s/-[^-]*$$//")
+# extract the current PETSc version
+PETSC_UPSTREAM_VERSION=$(shell pkg-config --modversion PETSc)
 # "Major" version is the first number in the upstream version (major.minor.release)
 PETSC_MAJOR_VERSION=$(shell echo $(PETSC_UPSTREAM_VERSION) | sed "s/^\([^.]*\)\..*$$/\1/")
 # "Minor" version is the second number in the upstream version (major.minor.release)
@@ -43,6 +43,8 @@ PETSC_MINOR_VERSION=$(shell echo $(PETSC_UPSTREAM_VERSION) | sed "s/^\([^.]*\)\.
 PETSC_VERSION=$(PETSC_MAJOR_VERSION).$(PETSC_MINOR_VERSION)
 PETSC_VERSION_NEXT=$(shell echo $(PETSC_MAJOR_VERSION).$$(($(PETSC_MINOR_VERSION)+1)))
 
+SLEPC_UPSTREAM_VERSION=$(shell pkg-config --modversion SLEPc)
+
 PETSC_DIR=/usr/lib/petscdir/$(PETSC_VERSION)-real
 # SLEPc version must match PETSc
 SLEPSC_DIR=/usr/lib/slepcdir/$(PETSC_VERSION)-real
@@ -134,8 +136,9 @@ override_dh_auto_install:
 	sed -i "s|-DNDEBUG||g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
 	sed -i "s/-Wdate-time//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
 
-# set petsc:Depends to something like "libpetsc3.7-dev, libslepc3.7-dev, python-petsc4py (>= 3.7), python-petsc4py (<<3.8), python-slepc4py (>= 3.7), python-slepc4py (<<3.8)"
-PETSC_DEV_DEPENDS="libpetsc$(PETSC_VERSION)-dev [!kfreebsd-amd64 !kfreebsd-i386], libslepc$(PETSC_VERSION)-dev [!kfreebsd-amd64 !kfreebsd-i386]"
+# set petsc:Depends to something like "libpetsc3.7.5-dev, libslepc3.7.3-dev, python-petsc4py (>= 3.7), python-petsc4py (<<3.8), python-slepc4py (>= 3.7), python-slepc4py (<<3.8)"
+PETSC_DEV_DEPENDS="libpetsc$(PETSC_UPSTREAM_VERSION)-dev [!kfreebsd-amd64 !kfreebsd-i386], libslepc$(SLEPC_UPSTREAM_VERSION)-dev [!kfreebsd-amd64 !kfreebsd-i386]"
+# slepc4py version must match petsc4py (using the PETSc minor version, not the patch release)
 PETSC4PY_DEPENDS=python-petsc4py (>= $(PETSC_VERSION)), python-petsc4py (<< $(PETSC_VERSION_NEXT)), python-slepc4py (>= $(PETSC_VERSION)), python-slepc4py (<< $(PETSC_VERSION_NEXT))
 override_dh_gencontrol:
 	# We have a tight dependency on swig - #675207

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