[vtk6] 08/12: Merge changes from version -8

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository vtk6.

commit ebbd7860cf30d92d33b5c5ca8b839d08066ce847
Merge: 7cd5e34 42b4281
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Wed Feb 17 00:06:23 2016 +0000

    Merge changes from version -8

 debian/changelog                    | 16 +++++++++++++---
 debian/control                      |  4 ++--
 debian/patches/100_javac-heap.patch | 18 ++++++++++++++++++
 debian/patches/series               |  1 +
 debian/tests/control                |  1 +
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 51162ee,e0553e8..c0b7db5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,13 +1,24 @@@
- vtk6 (6.2.0+dfsg1-8) UNRELEASED; urgency=medium
++vtk6 (6.2.0+dfsg1-9) UNRELEASED; urgency=medium
 +
 +  * [842987d] Add the libvtk*Qt*.so files to libvtk6-qt-dev
 +  * [7f90dea] Update Java installation locations
-   * [c15ed1e] Move Python packages aout of *-dev packages and 
-     provide a symlink in the python-vtk6 package instead 
++  * [c15ed1e] Move Python packages out of *-dev packages and 
++      provide a symlink in the python-vtk6 package instead 
 +  * [74543a2] add overrides and move PythonTK lib to python package
 +  * [2685ea2] Make perl scripts executable
 +
 + -- Gert Wollny <gw.fossdev at gmail.com>  Wed, 03 Feb 2016 15:05:29 +0000
 +
+ vtk6 (6.2.0+dfsg1-8) unstable; urgency=medium
+ 
+   [ Anton Gladky ]
+   * [3bf2478] Add allow-stderr to autopkgtest. (Closes: #767338)
+ 
+   [ Matthias Klose ]
+   * [78abebb] Set JVM max memory to 1024m.
+ 
+  -- Anton Gladky <gladk at debian.org>  Fri, 12 Feb 2016 20:37:38 +0100
+ 
  vtk6 (6.2.0+dfsg1-7) unstable; urgency=medium
  
    * Add patch 96_* to fix a race condition in vtkLookupTableMapData

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