[xdmf] 30/38: Merge branch 'debian/master' into dev-python3

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit 5a649993f14a40b82633c93ce9e8332895331712
Merge: 410a33c 0294562
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Oct 23 02:00:45 2016 +0100

    Merge branch 'debian/master' into dev-python3

 debian/changelog               |  9 +++++++-
 debian/libxdmf-dev.install     |  1 -
 debian/patches/hdf5-1.10.patch | 47 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 90a59e8,86601a9..51b31c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,20 @@@
 +xdmf (3.0+git20160803-1) UNRELEASED; urgency=medium
 +
 +  * Snapshot from Xdmf3
 +  * Add python3 support
 +  * Now depend on swig
++
++ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 22 Oct 2016 22:18:13 +0100
++
+ xdmf (2.1.dfsg.1-16) unstable; urgency=medium
+ 
+   * New patch from Giles Filipini to fix FTBFS against HDF5 1.10.
+     Closes: #841966.
    * Standards-Version: 3.9.8
    * Remove unnecessary postinst, prerm scripts
 +  * Ship utils, build-depend on libmetis-dev
  
-  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 20 Jun 2016 13:42:30 +0100
+  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 22 Oct 2016 22:18:13 +0100
  
  xdmf (2.1.dfsg.1-15) unstable; urgency=medium
  
diff --cc debian/patches/series
index f045637,d375aa2..c8814bd
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -5,5 -5,4 +5,6 @@@ reproducible-build.patc
  c++11.patch
  gzstream.patch
  python-install-dir.patch
 +python3.patch
 +exodus.patch
+ hdf5-1.10.patch

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