[vtk7] 02/02: Merge branch 'master' of alioth:/git/debian-science/packages/vtk7

[Nico Schlömer]

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

nschloe-guest pushed a commit to branch master
in repository vtk7.

commit 089a8025316f776d861baccac27550d6156b3f89
Merge: 59af42d ff85f32
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Wed May 17 10:50:18 2017 +0200

    Merge branch 'master' of alioth:/git/debian-science/packages/vtk7

 debian/patches/100_javac-heap.patch                |  8 ++---
 debian/patches/101_java_install_path.patch         |  8 ++---
 ...06_install_doxygen_scripts_in_nodoc_build.patch |  2 +-
 debian/patches/10_allpatches.patch                 |  8 ++---
 debian/patches/20_soversion-sharedlib.patch        | 16 ++++-----
 debian/patches/30_matplotlib.patch                 | 16 ++++-----
 debian/patches/70_fix_ftbfs_gcc49.patch            | 40 ++++++++++------------
 debian/patches/85_hdf5_1_10.patch                  | 12 +++----
 debian/patches/90_xdmf3_install.patch              | 26 +++++++-------
 debian/patches/95_xdmf3_version.patch              | 22 +++++-------
 10 files changed, 66 insertions(+), 92 deletions(-)

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