[dolfin] 01/01: constrain versioned dependencies to the minor version

[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 3ee18c14a68379ddea901d736fef0623133d06df
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 12 21:08:12 2016 +0800

    constrain versioned dependencies to the minor version
    
    assumes compatibility with patch version upgrades
---
 debian/control | 12 ++++++------
 debian/rules   | 22 ++++++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 1845588..ba3f662 100644
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,8 @@ Build-Depends:
  python-petsc4py, python-slepc4py,
  pkg-config,
  python-dev,
- python-ffc (= 2016.2.0),
- python-dijitso (= 2016.2.0),
+ python-ffc (>= 2016.2.0), python-ffc (<< 2016.3.0),
+ python-dijitso (>= 2016.2.0), python-dijitso (<< 2016.3.0),
  python-numpy,
  python-ply,
  swig3.0 (>= 3.0.3)
@@ -130,14 +130,14 @@ Architecture: any
 Depends:
  libdolfin-dev (= ${binary:Version}),
  libdolfin2016.2 (= ${binary:Version}),
- python-ffc (= 2016.2.0),
- python-dijitso (= 2016.2.0),
- python-instant (= 2016.2.0),
+ python-ffc (>= ${source:Upstream-Version}), python-ffc (<< ${source:Next-Upstream-Version}),
+ python-dijitso (>= ${source:Upstream-Version}), python-dijitso (<< ${source:Next-Upstream-Version}),
+ python-instant (>= ${source:Upstream-Version}), python-instant (<< ${source:Next-Upstream-Version}),
  python-numpy,
  python-ply,
  python-six,
  python-sympy,
- python-ufl (= 2016.2.0),
+ python-ufl (>= ${source:Upstream-Version}), python-ufl (<< ${source:Next-Upstream-Version}),
  ${petsc4py:Depends},
  ${misc:Depends},
  ${python:Depends},
diff --git a/debian/rules b/debian/rules
index e3807a6..253b8b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,17 @@
 #!/usr/bin/make -f
 
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\+dfsg.*$$//p')
+
+FENICS_RELEASE_VERSION=$(DEB_STRIPPED_UPSTREAM_VERSION)
+FENICS_MAJOR_VERSION=$(shell echo $(FENICS_RELEASE_VERSION) | sed "s/^\([^.]*\)\..*$$/\1/")
+FENICS_MINOR_VERSION=$(shell echo $(FENICS_RELEASE_VERSION) | sed "s/^\([^.]*\)\.\([^.]*\)\..*$$/\2/")
+FENICS_VERSION=$(FENICS_MAJOR_VERSION).$(FENICS_MINOR_VERSION)
+FENICS_NEXT_VERSION=$(FENICS_MAJOR_VERSION).$(shell echo $$(( $(FENICS_MINOR_VERSION) + 1 )) )
+
 # Allow test programs that uses OpenMPI to run
 export OMPI_MCA_plm_rsh_agent=/bin/false
 
@@ -132,22 +144,16 @@ override_dh_gencontrol:
 	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_DEPENDS)" >> debian/python-dolfin.substvars
-	dh_gencontrol -- -Vpetsc:Depends=$(PETSC_DEV_DEPENDS)
+	dh_gencontrol -- -Vpetsc:Depends=$(PETSC_DEV_DEPENDS) -Vsource:Next-Upstream-Version=$(FENICS_NEXT_VERSION)~
 
 override_dh_strip:
-	dh_strip -a --package=libdolfin2016.2 --dbg-package=libdolfin2016.2-dbg -Xpython
+	dh_strip -a --package=libdolfin$(FENICS_VERSION) --dbg-package=libdolfin$(FENICS_VERSION)-dbg -Xpython
 	dh_strip -a --package=python-dolfin --dbg-package=python-dolfin-dbg
 
 override_dh_installman:
 	dh_installman
 
 
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\+dfsg.*$$//p')
-
 .PHONY: get-orig-source override_dh_strip
 get-orig-source:
 	uscan --force-download --verbose --destdir $(USCAN_DESTDIR)

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