[ffc] 01/03: constrain versioned dependencies to minor version

Drew Parsons dparsons at moszumanska.debian.org
Tue Dec 13 05:46:50 UTC 2016


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

dparsons pushed a commit to tag debian/2016.2.0-1
in repository ffc.

commit d2101ad5ad3d921dec55c4de7998d5293573e09e
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Dec 13 13:38:06 2016 +0800

    constrain versioned dependencies to minor version
---
 debian/changelog |  5 +++++
 debian/control   |  8 ++++----
 debian/rules     | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25db050..498a019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ffc (2016.2.0-1) UNRELEASED; urgency=medium
 
+  [ Johannes Ring ]
   * New upstream release.
   * d/watch: Check pgp signature.
   * d/control:
@@ -20,6 +21,10 @@ ffc (2016.2.0-1) UNRELEASED; urgency=medium
     - Add lintian override 'ffc source: outdated-autotools-helper-file'
       for some test files that are not used in the Debian packaging.
 
+  [ Drew Parsons ]
+  * constrain versioned dependencies to minor version 
+    e.g. python-ufl (>= 2016.2.0), python-ufl (<< 2016.3~)
+
  -- Johannes Ring <johannr at simula.no>  Fri, 02 Dec 2016 09:45:35 +0100
 
 ffc (2016.1.0-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 11e87bc..a794b19 100644
--- a/debian/control
+++ b/debian/control
@@ -17,10 +17,10 @@ Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/fenics/ffc.g
 Package: python-ffc
 Architecture: all
 Depends:
- python-fiat (>= 2016.2.0),
- python-instant (>= 2016.2.0),
- python-ufl (>= 2016.2.0),
- python-dijitso (>= 2016.2.0),
+ python-fiat (>= ${source:Upstream-Version}), python-fiat (<< ${source:Next-Upstream-Version}),
+ python-instant (>= ${source:Upstream-Version}), python-instant (<< ${source:Next-Upstream-Version}),
+ python-ufl (>= ${source:Upstream-Version}), python-ufl (<< ${source:Next-Upstream-Version}),
+ python-dijitso (>= ${source:Upstream-Version}), python-dijitso (<< ${source:Next-Upstream-Version}),
  python-numpy,
  python-six,
  ${python:Depends},
diff --git a/debian/rules b/debian/rules
index 62a4227..58e91ce 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 )) )
+
 USCAN_DESTDIR := $(CURDIR)
 
 %:
@@ -11,6 +23,9 @@ override_dh_compress:
 override_dh_clean:
 	dh_clean ffc/git_commit_hash.py
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vsource:Next-Upstream-Version=$(FENICS_NEXT_VERSION)~
+
 .PHONY: get-orig-source
 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/ffc.git



More information about the debian-science-commits mailing list