[dolfin] 01/03: Merge branch 'master' into experimental

[Johannes Ring]

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

johannr-guest pushed a commit to branch experimental
in repository dolfin.

commit fcd3f0e7f8ab5cb08e7c8d92960c178836c49a65
Merge: 4415ce1 95a52a9
Author: Johannes Ring <johannr at simula.no>
Date:   Fri Jun 2 12:41:07 2017 +0200

    Merge branch 'master' into experimental

 debian/changelog                                    | 14 ++++++++++++++
 debian/control                                      |  1 +
 debian/patches/series                               |  1 +
 debian/patches/vtk-python2-only-cmake-usefile.patch | 12 ++++++++++++
 debian/rules                                        |  5 +++--
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 8f4acd5,747e43a..225ba96
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,17 +1,30 @@@
 +dolfin (2017.1.0-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * d/control:
 +    - Update package names (libdolfin2016.2 -> libdolfin2017.1
 +      and libdolfin2016.2-dbg -> libdolfin2017.1-dbg).
 +    - Bump minimum required version for python-dijitso and python-ffc to
 +      2017.1 in Build-Depends.
 +  * Move d/libdolfin2016.2.install -> d/libdolfin2017.1.install.
 +  * d/patches/python3-support.patch: removed (fixed upstream).
 +
 + -- Johannes Ring <johannr at simula.no>  Tue, 30 May 2017 13:56:42 +0200
 +
+ dolfin (2016.2.0-4) UNRELEASED; urgency=medium
+ 
+   * d/rules:
+     - Re-generate swig interface with correct Python version
+       before build and install (Closes: #863829).
+     - Build for Python 2 after Python 3 by switching the order in
+       PYVERS, since Python 2 is default.
+   * Add patch vtk-python2-only-cmake-usefile.patch that disables the
+     vtk section in UseDOLFIN.cmake for Python 3 (Closes: #863828).
+   * d/control: Add python-ffc to Depends for binary package
+     libdolfin-dev (provides ufc.h).
+ 
+  -- Johannes Ring <johannr at simula.no>  Thu, 01 Jun 2017 10:08:39 +0200
+ 
  dolfin (2016.2.0-3) unstable; urgency=medium
  
    [ Drew Parsons ]
diff --cc debian/patches/series
index 8240355,9a23a31..3a10e6f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,3 +1,2 @@@
 -python3-support.patch
  python3-decode.patch
+ vtk-python2-only-cmake-usefile.patch

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