[dolfin] 01/01: libdolfin-dev: use alternative python dependencies

[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 a8a2c7d7e1cbd1afe87bd5b3bbb187b0520e1fe6
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Jun 7 16:35:19 2017 +0800

    libdolfin-dev: use alternative python dependencies
    
    libdolfin-dev depends on either the python2 or python3 version of
    modules. Don't force python2 if the system admin prefers python3.
---
 debian/changelog | 7 +++++++
 debian/control   | 5 ++---
 debian/rules     | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c749e96..239317e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dolfin (2016.2.0-5) UNRELEASED; urgency=medium
+
+  * libdolfin-dev depends on either the python2 or python3 version of
+    modules.
+
+ -- Drew Parsons <dparsons at debian.org>  Wed, 07 Jun 2017 16:30:40 +0800
+
 dolfin (2016.2.0-4) unstable; urgency=medium
 
   [ Johannes Ring ]
diff --git a/debian/control b/debian/control
index 1c21bab..703687f 100644
--- a/debian/control
+++ b/debian/control
@@ -77,10 +77,9 @@ Depends:
  libvtk6-dev,
  libxml2-dev,
  pkg-config,
- python-ffc (>= ${source:Upstream-Version}), python-ffc (<< ${source:Next-Upstream-Version}),
+ python-ffc (>= ${source:Upstream-Version}) | python3-ffc (>= ${source:Upstream-Version}), python-ffc (<< ${source:Next-Upstream-Version}) | python3-ffc (<< ${source:Next-Upstream-Version}),
  ${petsc:Depends},
- ${python-petsc4py:Depends},
- ${python3-petsc4py:Depends},
+ ${python-petsc4py-alt:Depends},
  ${misc:Depends}
 Conflicts:
  libdolfin0-dev,
diff --git a/debian/rules b/debian/rules
index ad6f166..24ae689 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,6 +129,7 @@ PETSC_DEV_DEPENDS="libpetsc$(PETSC_UPSTREAM_VERSION)-dev, libslepc$(SLEPC_UPSTRE
 # 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))
 PETSC4PY_DEPENDS_PY3=python3-petsc4py (>= $(PETSC_VERSION)), python3-petsc4py (<< $(PETSC_VERSION_NEXT)), python3-slepc4py (>= $(PETSC_VERSION)), python3-slepc4py (<< $(PETSC_VERSION_NEXT))
+PETSC4PY_DEPENDS_ALT=python-petsc4py (>= $(PETSC_VERSION)) | python3-petsc4py (>= $(PETSC_VERSION)), python-petsc4py (<< $(PETSC_VERSION_NEXT)) | python3-petsc4py (<< $(PETSC_VERSION_NEXT)), python-slepc4py (>= $(PETSC_VERSION)) | python3-slepc4py (>= $(PETSC_VERSION)), python-slepc4py (<< $(PETSC_VERSION_NEXT)) | python3-slepc4py (<< $(PETSC_VERSION_NEXT))
 override_dh_gencontrol:
 	# We have a tight dependency on swig - #675207
 	set -e; \
@@ -137,7 +138,7 @@ override_dh_gencontrol:
 	echo "swig:Depends=swig3.0 (>= $$swig_version), swig3.0 (<< $$next_swig_version~)" >> debian/python-dolfin.substvars
 	echo "python-petsc4py:Depends=$(PETSC4PY_DEPENDS)" >> debian/python-dolfin.substvars
 	echo "python3-petsc4py:Depends=$(PETSC4PY_DEPENDS_PY3)" >> debian/python3-dolfin.substvars
-	echo "petsc4py:Depends=$(PETSC4PY_DEPENDS)" >> debian/libdolfin-dev.substvars
+	echo "python-petsc4py-alt:Depends=$(PETSC4PY_DEPENDS_ALT)" >> debian/libdolfin-dev.substvars
 	dh_gencontrol -- -Vpetsc:Depends=$(PETSC_DEV_DEPENDS) -Vsource:Next-Upstream-Version=$(FENICS_NEXT_VERSION)~
 
 override_dh_strip:

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