[dolfin] 04/04: fix petsc4py dependencies
Drew Parsons
dparsons at moszumanska.debian.org
Thu Aug 11 14:50:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch master
in repository dolfin.
commit 961588bda9989a124f68fcc222bb9f408d8c864b
Author: Drew Parsons <dparsons at debian.org>
Date: Thu Aug 11 22:45:22 2016 +0800
fix petsc4py dependencies
---
debian/rules | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 94a13ad..e46275e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ PETSC_MAJOR_VERSION=$(shell echo $(PETSC_UPSTREAM_VERSION) | sed "s/^\([^.]*\)\.
# "Minor" version is the second number in the upstream version (major.minor.release)
PETSC_MINOR_VERSION=$(shell echo $(PETSC_UPSTREAM_VERSION) | sed "s/^\([^.]*\)\.\([^.]*\)\..*$$/\2/")
PETSC_VERSION=$(PETSC_MAJOR_VERSION).$(PETSC_MINOR_VERSION)
-PETSC_VERSION_NEXT=$(shell $(PETSC_MAJOR_VERSION).$$(($(PETSC_MINOR_VERSION)+1)))
+PETSC_VERSION_NEXT=$(shell echo $(PETSC_MAJOR_VERSION).$$(($(PETSC_MINOR_VERSION)+1)))
PETSC_DIR=/usr/lib/petscdir/$(PETSC_VERSION)-real
# SLEPc version must match PETSc
@@ -124,14 +124,14 @@ override_dh_auto_install:
# 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]"
-PETSC4PY_DEV_DEPENDS="python-petsc4py (>= $(PETSC_VERSION), python-petsc4py (<< $(PETSC_VERSION_NEXT)), python-slepc4py (>= $(PETSC_VERSION), python-slepc4py (<< $(PETSC_VERSION_NEXT))"
+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
set -e; \
swig_version=$$(dpkg-query -W swig3.0 | cut -f 2 | cut -d- -f 1); \
next_swig_version="$${swig_version%.*}.$$(($${swig_version##*.} + 1))"; \
echo "swig:Depends=swig3.0 (>= $$swig_version), swig3.0 (<< $$next_swig_version~)" >> debian/python-dolfin.substvars
- echo "petsc4py:Depends=$(PETSC4PY_DEV_DEPENDS)" >> debian/python-dolfin.substvars
+ echo "petsc4py:Depends=$(PETSC4PY_DEPENDS)" >> debian/python-dolfin.substvars
dh_gencontrol -- -Vpetsc:Depends=$(PETSC_DEV_DEPENDS)
override_dh_strip:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/dolfin.git
More information about the debian-science-commits
mailing list