[dolfin] 07/08: FEniCS version dependencies are taken as >=2017.2 and <=2017.3~

Drew Parsons dparsons at moszumanska.debian.org
Sun Jan 21 15:00:13 UTC 2018


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

dparsons pushed a commit to tag experimental/2017.2.0.post0-1exp1
in repository dolfin.

commit 1a30fea45c032f04d0d75ed13817d35ed0f70ff5
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Jan 21 21:21:10 2018 +0800

    FEniCS version dependencies are taken as >=2017.2 and <=2017.3~
    
    i.e. depend on major.minor version only, not patch/release versions
---
 debian/changelog |  2 ++
 debian/control   | 18 +++++++++---------
 debian/rules     |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c4204c..5a0336e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ dolfin (2017.2.0.post0-1) UNRELEASED; urgency=medium
     - VTK no longer supported
   * debhelper compatibility level 11
   * debian/control: Priority: optional not extra
+  * FEniCS version dependencies are taken as >=2017.2 and <=2017.3~
+    i.e. depend on major.minor version only
 
  -- Drew Parsons <dparsons at debian.org>  Sat, 07 Oct 2017 15:36:09 +0800
 
diff --git a/debian/control b/debian/control
index c7a1700..91f0012 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Depends:
  libscotch-dev,
  libxml2-dev,
  pkg-config,
- python-ffc (>= ${source:Upstream-Version}) | python3-ffc (>= ${source:Upstream-Version}), python-ffc (<< ${source:Next-Upstream-Version}) | python3-ffc (<< ${source:Next-Upstream-Version}),
+ python-ffc (>= ${fenics:Upstream-Version}) | python3-ffc (>= ${fenics:Upstream-Version}), python-ffc (<< ${fenics:Next-Upstream-Version}) | python3-ffc (<< ${fenics:Next-Upstream-Version}),
  ${petsc:Depends},
  ${python-petsc4py-alt:Depends},
  ${misc:Depends}
@@ -141,14 +141,14 @@ Architecture: any
 Depends:
  libdolfin-dev (= ${binary:Version}),
  libdolfin2017.2 (= ${binary:Version}),
- 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-ffc (>= ${fenics:Upstream-Version}), python-ffc (<< ${fenics:Next-Upstream-Version}),
+ python-dijitso (>= ${fenics:Upstream-Version}), python-dijitso (<< ${fenics:Next-Upstream-Version}),
+ python-instant (>= ${fenics:Upstream-Version}), python-instant (<< ${fenics:Next-Upstream-Version}),
  python-numpy,
  python-ply,
  python-six,
  python-sympy,
- python-ufl (>= ${source:Upstream-Version}), python-ufl (<< ${source:Next-Upstream-Version}),
+ python-ufl (>= ${fenics:Upstream-Version}), python-ufl (<< ${fenics:Next-Upstream-Version}),
  ${python-petsc4py:Depends},
  ${misc:Depends},
  ${python:Depends},
@@ -172,14 +172,14 @@ Architecture: any
 Depends:
  libdolfin-dev (= ${binary:Version}),
  libdolfin2017.2 (= ${binary:Version}),
- python3-ffc (>= ${source:Upstream-Version}), python3-ffc (<< ${source:Next-Upstream-Version}),
- python3-dijitso (>= ${source:Upstream-Version}), python3-dijitso (<< ${source:Next-Upstream-Version}),
- python3-instant (>= ${source:Upstream-Version}), python3-instant (<< ${source:Next-Upstream-Version}),
+ python3-ffc (>= ${fenics:Upstream-Version}), python3-ffc (<< ${fenics:Next-Upstream-Version}),
+ python3-dijitso (>= ${fenics:Upstream-Version}), python3-dijitso (<< ${fenics:Next-Upstream-Version}),
+ python3-instant (>= ${fenics:Upstream-Version}), python3-instant (<< ${fenics:Next-Upstream-Version}),
  python3-numpy,
  python3-ply,
  python3-six,
  python3-sympy,
- python3-ufl (>= ${source:Upstream-Version}), python3-ufl (<< ${source:Next-Upstream-Version}),
+ python3-ufl (>= ${fenics:Upstream-Version}), python3-ufl (<< ${fenics:Next-Upstream-Version}),
  ${python3-petsc4py:Depends},
  ${misc:Depends},
  ${python3:Depends},
diff --git a/debian/rules b/debian/rules
index ba36a6f..fbf4e69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,7 +138,7 @@ override_dh_gencontrol:
 	echo "python-petsc4py:Depends=$(PETSC4PY_DEPENDS)" >> debian/python-dolfin.substvars
 	echo "python3-petsc4py:Depends=$(PETSC4PY_DEPENDS_PY3)" >> debian/python3-dolfin.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)~
+	dh_gencontrol -- -Vpetsc:Depends=$(PETSC_DEV_DEPENDS) -Vfenics:Upstream-Version=$(FENICS_VERSION) -Vfenics:Next-Upstream-Version=$(FENICS_NEXT_VERSION)~
 
 override_dh_strip:
 	dh_strip -a --package=libdolfin$(FENICS_VERSION) --dbg-package=libdolfin$(FENICS_VERSION)-dbg -Xpython

-- 
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