[dolfin] 02/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 320a518ef6bc31eca59fba2f34dae1b172cca465
Merge: fcd3f0e 534ca3b
Author: Johannes Ring <johannr at simula.no>
Date:   Thu Jul 6 19:40:48 2017 +0200

    Merge branch 'master' into experimental

 debian/changelog | 16 ++++++++++++----
 debian/control   |  5 ++---
 debian/rules     |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 225ba96,0f2e9b5..4725162
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,16 +1,29 @@@
 +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
+ dolfin (2016.2.0-5) unstable; urgency=medium
  
+   * libdolfin-dev depends on either the python2 or python3 version of
+     modules (enables python3-only installation).
+ 
+  -- Drew Parsons <dparsons at debian.org>  Thu, 06 Jul 2017 15:21:57 +0800
+ 
+ dolfin (2016.2.0-4) unstable; urgency=medium
+ 
+   [ Johannes Ring ]
    * d/rules:
      - Re-generate swig interface with correct Python version
-       before build and install (Closes: #863829).
+       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

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