[vtk6] 01/02: Add some files to the installation to enable paraview to be build on top of vtk6 with USE_EXTERNAL_VTK option
Christophe Trophime
trophime-guest at alioth.debian.org
Mon Nov 4 11:50:54 UTC 2013
This is an automated email from the git hooks/post-receive script.
trophime-guest pushed a commit to branch master
in repository vtk6.
commit 250ffb0664aa725a3726531a331a38b0e90dd23a
Author: Christophe Trophime <christrophime at googlemail.com>
Date: Wed Oct 30 11:56:11 2013 +0100
Add some files to the installation to enable paraview
to be build on top of vtk6 with USE_EXTERNAL_VTK option
---
debian/control | 23 +-
debian/libvtk6-dev.install | 32 ++
debian/patches/Qt4.patch | 62 +++
debian/patches/allpatches.patch | 57 +++
debian/patches/docs.patch | 32 ++
debian/patches/examples-add-shebang.patch | 594 +++++++++++++++++++++++++++++
debian/patches/libav9.patch | 9 +
debian/patches/matplotlib.patch | 15 +
debian/patches/series | 8 +
debian/patches/soversion-sharedlib.patch | 28 ++
debian/patches/use_system_json.patch | 38 ++
debian/patches/vtkTclWrapper.patch | 16 +
debian/patches/vtkWrapJava.patch | 232 +++++++++++
debian/python-vtk6.install | 4 +
debian/rules | 29 +-
15 files changed, 1172 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index 535d3c6..e555c7a 100644
--- a/debian/control
+++ b/debian/control
@@ -40,19 +40,30 @@ Build-Depends:
libxt-dev,
mpi-default-dev,
pkg-config,
- python-dev (>= 2.5.3),
- python-support (>= 0.5.3),
- tcl8.5-dev,
- tk8.5-dev,
+ python-all-dev (>= 2.7), python-all-dev (<< 2.8),
+ dh-python,
+ tcl8.6-dev,
+ tk8.6-dev,
x11proto-core-dev,
xvfb,
- zlib1g-dev
+ zlib1g-dev,
+ hdf5-tools,
+ libgl2ps-dev, libjsoncpp-dev,
+ python-mpi4py,
+ libboost-all-dev,
+ libxpm-dev,
+ libmrmpi-dev, python-matplotlib,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
+ xvfb, xauth,
+ r-base, r-base-core, r-base-dev,
+ chrpath
Build-Depends-Indep:
doxygen-latex,
ghostscript,
gnuplot-nox,
graphviz,
- libdigest-md5-perl
+ libdigest-md5-perl,
+ texlive-binaries, texlive-math-extra
XS-Python-Version: current
Uploaders:
A. Maitland Bottoms <bottoms at debian.org>,
diff --git a/debian/libvtk6-dev.install b/debian/libvtk6-dev.install
index 364ab10..79f8977 100644
--- a/debian/libvtk6-dev.install
+++ b/debian/libvtk6-dev.install
@@ -1,3 +1,35 @@
usr/include/vtk-6.0 usr/include
usr/lib/*/*.so
usr/lib/cmake/vtk-6.0
+
+usr/bin/vtkProcessShader-6.0
+usr/bin/vtkParseOGLExt-6.0
+usr/bin/vtkEncodeString-6.0
+usr/bin/vtkHashSource-6.0
+usr/bin/vtkWrapHierarchy-6.0
+
+# add doxygen docs
+debian/build/Utilities/Doxygen/doc/html usr/share/doc/libvtk6-dev
+
+# to get paraview debian/build properly on top of vtk
+debian/build/lib/cmake/vtk-6.0/Modules/*-Headers.cmake usr/lib/cmake/vtk-6.0/Modules/
+CMake/vtkTesting*.cmake usr/lib/vtk-6.0/
+
+debian/build/ThirdParty/ftgl/vtkftglConfig.h usr/include/vtk-6.0/
+ThirdParty/ftgl/src/FTGL.h usr/include/vtk-6.0/
+
+Common/DataModel/vtkMarchingCubesCases.h usr/include/vtk-6.0/
+Common/Core/vtkPointAccumulator.hxx usr/include/vtk-6.0/
+Filters/Statistics/vtkStatisticsAlgorithmPrivate.h usr/include/vtk-6.0/
+
+ThirdParty/netcdf/vtk_netcdf.h usr/include/vtk-6.0/
+ThirdParty/netcdf/vtk_netcdfcpp.h usr/include/vtk-6.0/
+
+Testing/Core/vtkTestDriver.h usr/include/vtk-6.0
+Testing/Core/vtkTesting*.h usr/include/vtk-6.0
+Testing/Core/vtkTestUtilities.h usr/include/vtk-6.0/
+Testing/Rendering/vtkTesting*.h usr/include/vtk-6.0
+Testing/Rendering/vtkRegressionTestImage.h usr/include/vtk-6.0/
+
+IO/Import/vtk3DS.h usr/include/vtk-6.0/
+
diff --git a/debian/patches/Qt4.patch b/debian/patches/Qt4.patch
new file mode 100644
index 0000000..3362384
--- /dev/null
+++ b/debian/patches/Qt4.patch
@@ -0,0 +1,62 @@
+Index: vtk-6.0.0/GUISupport/Qt/CMakeLists.txt
+===================================================================
+--- vtk-6.0.0.orig/GUISupport/Qt/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/GUISupport/Qt/CMakeLists.txt 2013-10-15 08:31:55.000000000 +0200
+@@ -54,7 +54,7 @@
+
+ # import Qt4 build settings
+ set(QT_USE_QTNETWORK 1)
+-find_package(Qt4 REQUIRED QUIET)
++find_package(Qt4 REQUIRED)
+ mark_as_advanced(QT_QMAKE_EXECUTABLE)
+ include(${QT_USE_FILE})
+
+Index: vtk-6.0.0/GUISupport/QtSQL/CMakeLists.txt
+===================================================================
+--- vtk-6.0.0.orig/GUISupport/QtSQL/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/GUISupport/QtSQL/CMakeLists.txt 2013-10-15 08:31:44.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ # import Qt4 build settings
+ set(QT_USE_QTSQL 1)
+-find_package(Qt4 REQUIRED QUIET)
++find_package(Qt4 REQUIRED)
+ include(${QT_USE_FILE})
+
+ set(${vtk-module}_NO_HeaderTest 1)
+Index: vtk-6.0.0/GUISupport/QtWebkit/CMakeLists.txt
+===================================================================
+--- vtk-6.0.0.orig/GUISupport/QtWebkit/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/GUISupport/QtWebkit/CMakeLists.txt 2013-10-15 08:31:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-find_package(Qt4 REQUIRED QtCore QtGui QtWebKit QUIET)
++find_package(Qt4 REQUIRED QtCore QtGui QtWebKit)
+
+ # Rich-text view requires Qt >= 4.5.0
+ # Rich-text depends on Qt Webkit which is not portable on Unix (AIX & HP-UX)
+Index: vtk-6.0.0/Rendering/Qt/CMakeLists.txt
+===================================================================
+--- vtk-6.0.0.orig/Rendering/Qt/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Rendering/Qt/CMakeLists.txt 2013-10-15 08:31:25.000000000 +0200
+@@ -7,7 +7,7 @@
+ )
+
+ # import Qt4 build settings
+-find_package(Qt4 REQUIRED QtCore QtGui QUIET)
++find_package(Qt4 REQUIRED QtCore QtGui)
+ include(${QT_USE_FILE})
+
+ vtk_module_library(${vtk-module} ${LibSrcs})
+Index: vtk-6.0.0/Views/Qt/CMakeLists.txt
+===================================================================
+--- vtk-6.0.0.orig/Views/Qt/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Views/Qt/CMakeLists.txt 2013-10-15 08:32:00.000000000 +0200
+@@ -19,7 +19,7 @@
+
+ # import Qt4 build settings
+ set(QT_USE_QTNETWORK 1)
+-find_package(Qt4 REQUIRED QUIET)
++find_package(Qt4 REQUIRED)
+ include(${QT_USE_FILE})
+
+ qt4_wrap_cpp(LibMocSrcs ${MocHeaders})
diff --git a/debian/patches/allpatches.patch b/debian/patches/allpatches.patch
new file mode 100644
index 0000000..44e288c
--- /dev/null
+++ b/debian/patches/allpatches.patch
@@ -0,0 +1,57 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk (5.8.0-13) unstable; urgency=low
+ .
+ * Make sure to include VTK/QT cmake file. Closes: #656115
+ * Revert back to libtiff4-dev and use libtiff-dev in d/control. Closes: #674998
+ * Fix tkInt.h installation, using proper cmake magic. Closes: #674169
+ * Make sure to discover init.tcl properly. Closes: #673245
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/656115
+Bug-Debian: http://bugs.debian.org/673245
+Bug-Debian: http://bugs.debian.org/674169
+Bug-Debian: http://bugs.debian.org/674998
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: vtk-6.0.0/Utilities/Doxygen/doxyfile.in
+===================================================================
+--- vtk-6.0.0.orig/Utilities/Doxygen/doxyfile.in 2013-10-08 08:46:11.000000000 +0200
++++ vtk-6.0.0/Utilities/Doxygen/doxyfile.in 2013-10-08 08:46:11.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ HAVE_DOT = @HAVE_DOT_YESNO@
+ DOT_PATH = "@DOT_PATH@"
++DOT_IMAGE_FORMAT = svg
+ CLASS_GRAPH = YES
+ COLLABORATION_GRAPH = YES
+ TEMPLATE_RELATIONS = YES
+Index: vtk-6.0.0/Wrapping/Tcl/vtkTkAppInit.cxx
+===================================================================
+--- vtk-6.0.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx 2013-10-08 08:46:11.000000000 +0200
++++ vtk-6.0.0/Wrapping/Tcl/vtkTkAppInit.cxx 2013-10-08 08:46:11.000000000 +0200
+@@ -165,6 +165,8 @@
+ // Help Tcl find the Tcl/Tk helper files.
+ const char* relative_dirs[] =
+ {
++ "../share/tcltk",
++ "../../share/tcltk",
+ "TclTk/lib",
+ ".." VTK_INSTALL_TCL_DIR,
+ 0
diff --git a/debian/patches/docs.patch b/debian/patches/docs.patch
new file mode 100644
index 0000000..ba04b5d
--- /dev/null
+++ b/debian/patches/docs.patch
@@ -0,0 +1,32 @@
+Index: vtk6/Utilities/Doxygen/doxyfile.in
+===================================================================
+--- vtk6.orig/Utilities/Doxygen/doxyfile.in 2013-11-04 11:39:57.054144719 +0100
++++ vtk6/Utilities/Doxygen/doxyfile.in 2013-11-04 11:42:40.814137832 +0100
+@@ -12,7 +12,7 @@
+ GENERATE_TODOLIST = YES
+ GENERATE_BUGLIST = YES
+ GENERATE_HTML = YES
+-GENERATE_HTMLHELP = YES
++GENERATE_HTMLHELP = NO
+ GENERATE_LATEX = NO
+ GENERATE_MAN = NO
+ GENERATE_RTF = NO
+@@ -92,14 +92,16 @@
+ SORT_MEMBER_DOCS = NO
+ DISTRIBUTE_GROUP_DOC = YES
+ TAB_SIZE = 3
+-DETAILS_AT_TOP = YES
++#obsolete
++#DETAILS_AT_TOP = YES
+ SHORT_NAMES = @DOXYGEN_SHORT_NAMES@
+ # PAPER_TYPE = letter
+
+ FILE_PATTERNS = *.h
+ RECURSIVE = YES
+
+-HTML_ALIGN_MEMBERS = YES
++#obsolete
++"HTML_ALIGN_MEMBERS = YES
+
+ ALPHABETICAL_INDEX = YES
+ COLS_IN_ALPHA_INDEX = 3
diff --git a/debian/patches/examples-add-shebang.patch b/debian/patches/examples-add-shebang.patch
new file mode 100644
index 0000000..7f50ab7
--- /dev/null
+++ b/debian/patches/examples-add-shebang.patch
@@ -0,0 +1,594 @@
+Index: vtk-6.0.0/Examples/GUI/Python/OrthogonalPlanesWithTkPhoto.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/GUI/Python/OrthogonalPlanesWithTkPhoto.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/GUI/Python/OrthogonalPlanesWithTkPhoto.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import vtk
+ from vtk import *
+ import Tkinter
+Index: vtk-6.0.0/Examples/Graphics/Python/SegmentAndBrokenLineSources.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Graphics/Python/SegmentAndBrokenLineSources.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Graphics/Python/SegmentAndBrokenLineSources.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ ############################################################
+ from vtk import *
+ ############################################################
+Index: vtk-6.0.0/Examples/Graphics/Python/SingleYoungsMaterialInterface.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Graphics/Python/SingleYoungsMaterialInterface.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Graphics/Python/SingleYoungsMaterialInterface.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ ############################################################
+ from vtk import *
+ from vtk.util.misc import vtkGetDataRoot
+Index: vtk-6.0.0/Examples/Hybrid/Python/CylinderAndPolarAxes.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Hybrid/Python/CylinderAndPolarAxes.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Hybrid/Python/CylinderAndPolarAxes.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ ############################################################
+ from vtk import *
+ ############################################################
+Index: vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_filter.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/Matlab_engine_filter.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_filter.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ # Python example script that uses the Matlab Engine filter to compute the
+ # degree centraility for an input graph and display the result.
+Index: vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_interface.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/Matlab_engine_interface.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_interface.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ # Python example script that uses the vtkMatlabEngineInterface to perform
+ # a calculation (sin(x)^2 + cos(x)^2 = 1) on VTK array data, and pass the
+Index: vtk-6.0.0/Examples/Infovis/Python/Rcalculator_mst.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/Rcalculator_mst.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/Rcalculator_mst.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ # Python examples script that uses the R calculator filter to find the
+ # maxiumum spanning tree of a random input graph by inverting the edge
+Index: vtk-6.0.0/Examples/Infovis/Python/Rcalculator_vd.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/Rcalculator_vd.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/Rcalculator_vd.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ # Python example script that uses the RcalculatorFilter to compute the mean
+ # vertex degree of the input graph and the distance from the mean for each
+Index: vtk-6.0.0/Examples/Infovis/Python/Rinterface.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/Rinterface.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/Rinterface.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ # Python example script that uses the vtkRIinterface to create an instance of the
+ # R interpreter and pass it some data, modify the data in R, and pass the result
+Index: vtk-6.0.0/Examples/Infovis/Python/Rrand_table.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/Rrand_table.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/Rrand_table.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ # Python example script that uses the Gnu R random table source to create an output
+ # table with 5 columns and 30 rows. The columns are filled random numbers drawn
+Index: vtk-6.0.0/Examples/Infovis/Python/adjacency_matrix_to_graph.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/adjacency_matrix_to_graph.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/adjacency_matrix_to_graph.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/aggregate.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/aggregate.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/aggregate.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/boost_bfs.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/boost_bfs.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/boost_bfs.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/boost_centrality.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/boost_centrality.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/boost_centrality.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/boost_mst.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/boost_mst.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/boost_mst.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/boost_mst_extract_graph.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/boost_mst_extract_graph.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/boost_mst_extract_graph.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/boost_mst_with_hgv.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/boost_mst_with_hgv.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/boost_mst_with_hgv.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/circular_vertices.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/circular_vertices.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/circular_vertices.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file demonstrates drawing graphs using circular vertices via
+ vtkRenderedGraphRepresentation.
+Index: vtk-6.0.0/Examples/Infovis/Python/cone_layout.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/cone_layout.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/cone_layout.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+
+Index: vtk-6.0.0/Examples/Infovis/Python/contingency_port_protocol.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/contingency_port_protocol.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/contingency_port_protocol.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/create_tree.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/create_tree.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/create_tree.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ graph = vtkMutableDirectedGraph()
+Index: vtk-6.0.0/Examples/Infovis/Python/database_query1.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/database_query1.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/database_query1.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/databases.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/databases.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/databases.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/databases2.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/databases2.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/databases2.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader1.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/delimited_text_reader1.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader1.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ csv_source = vtkDelimitedTextReader()
+Index: vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader2.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/delimited_text_reader2.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader2.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ csv_source = vtkDelimitedTextReader()
+Index: vtk-6.0.0/Examples/Infovis/Python/displayVTKHierarchy.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/displayVTKHierarchy.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/displayVTKHierarchy.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ import vtk
+ import inspect
+ import csv
+Index: vtk-6.0.0/Examples/Infovis/Python/filters.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/filters.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/filters.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/geoview.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/geoview.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/geoview.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/graph1.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/graph1.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/graph1.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file demonstrates the creation of a directed graph using the
+ Python interface to VTK.
+Index: vtk-6.0.0/Examples/Infovis/Python/graph3d.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/graph3d.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/graph3d.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ from vtk.util.misc import vtkGetDataRoot
+ VTK_DATA_ROOT = vtkGetDataRoot()
+Index: vtk-6.0.0/Examples/Infovis/Python/graph_selection_subtract.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/graph_selection_subtract.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/graph_selection_subtract.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/graph_tree_ring.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/graph_tree_ring.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/graph_tree_ring.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ addStringLabel = vtkProgrammableFilter()
+Index: vtk-6.0.0/Examples/Infovis/Python/gui.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/gui.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/gui.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from PyQt4 import QtCore
+ from PyQt4 import QtGui
+ from PyQt4 import uic
+Index: vtk-6.0.0/Examples/Infovis/Python/hello_world.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/hello_world.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/hello_world.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ from vtk import *
+
+Index: vtk-6.0.0/Examples/Infovis/Python/hierarchical_graph.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/hierarchical_graph.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/hierarchical_graph.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/icicle_view.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/icicle_view.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/icicle_view.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ reader2 = vtkXMLTreeReader()
+Index: vtk-6.0.0/Examples/Infovis/Python/icicle_view_simple.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/icicle_view_simple.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/icicle_view_simple.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ reader1 = vtkXMLTreeReader()
+Index: vtk-6.0.0/Examples/Infovis/Python/labels.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/labels.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/labels.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ import random
+ from vtk import *
+Index: vtk-6.0.0/Examples/Infovis/Python/merge_graphs.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/merge_graphs.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/merge_graphs.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file demonstrates the creation of a directed graph using the
+ Python interface to VTK.
+Index: vtk-6.0.0/Examples/Infovis/Python/mysql_database.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/mysql_database.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/mysql_database.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ database = vtkSQLDatabase.CreateFromURL("mysql://enron@vizdb.srn.sandia.gov:3306/enron")
+Index: vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/programmable_pipeline.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline2.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/programmable_pipeline2.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline2.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file demonstrates the creation of a directed graph using the
+ Python interface to VTK.
+Index: vtk-6.0.0/Examples/Infovis/Python/psql_database.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/psql_database.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/psql_database.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ # Network Database
+Index: vtk-6.0.0/Examples/Infovis/Python/random3d.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/random3d.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/random3d.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/selection.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/selection.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/selection.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/selection_domain.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/selection_domain.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/selection_domain.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/simple_selection.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/simple_selection.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/simple_selection.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ from vtk import *
+Index: vtk-6.0.0/Examples/Infovis/Python/statistics_temperatures.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/statistics_temperatures.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/statistics_temperatures.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/streaming_statistics.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/streaming_statistics.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/streaming_statistics.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/streaming_statistics_pyqt.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/streaming_statistics_pyqt.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/streaming_statistics_pyqt.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+ import sys
+Index: vtk-6.0.0/Examples/Infovis/Python/tables1.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/tables1.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/tables1.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file contains Python code illustrating the creation and manipulation of
+ vtkTable objects.
+Index: vtk-6.0.0/Examples/Infovis/Python/tables2.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/tables2.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/tables2.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file contains Python code illustrating the creation and manipulation of
+ vtkTable objects.
+Index: vtk-6.0.0/Examples/Infovis/Python/tables3.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/tables3.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/tables3.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ if __name__ == "__main__":
+Index: vtk-6.0.0/Examples/Infovis/Python/tables4.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/tables4.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/tables4.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file provides a more advanced example of vtkTable access and
+ manipulation methods.
+Index: vtk-6.0.0/Examples/Infovis/Python/tables_adv.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/tables_adv.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/tables_adv.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file contains Python code illustrating the creation and manipulation of
+ vtkTable objects.
+Index: vtk-6.0.0/Examples/Infovis/Python/theme.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/theme.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/theme.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ source = vtkRandomGraphSource()
+Index: vtk-6.0.0/Examples/Infovis/Python/tree1.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/tree1.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/tree1.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ """
+ This file demonstrates the creation of a tree using the
+ Python interface to VTK.
+Index: vtk-6.0.0/Examples/Infovis/Python/tree_map.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/tree_map.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/tree_map.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/Infovis/Python/treemap_view.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/treemap_view.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/treemap_view.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ reader1 = vtkXMLTreeReader()
+Index: vtk-6.0.0/Examples/Infovis/Python/treering_hierarchical_view.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/treering_hierarchical_view.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/treering_hierarchical_view.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+
+ from vtk import *
+
+Index: vtk-6.0.0/Examples/Infovis/Python/treering_view.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/treering_view.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/treering_view.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ reader2 = vtkXMLTreeReader()
+Index: vtk-6.0.0/Examples/Infovis/Python/treering_view_simple.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/treering_view_simple.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/treering_view_simple.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ reader1 = vtkXMLTreeReader()
+Index: vtk-6.0.0/Examples/Infovis/Python/vertex_degree_programmable.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/vertex_degree_programmable.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/vertex_degree_programmable.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+
+ vertexDegree = vtkProgrammableFilter()
+Index: vtk-6.0.0/Examples/Infovis/Python/views.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/Infovis/Python/views.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/Infovis/Python/views.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import os.path
+
+Index: vtk-6.0.0/Examples/ParallelProcessing/MPI/Python/ParallelCone.py
+===================================================================
+--- vtk-6.0.0.orig/Examples/ParallelProcessing/MPI/Python/ParallelCone.py 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Examples/ParallelProcessing/MPI/Python/ParallelCone.py 2013-10-18 23:11:25.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from vtk import *
+ import sys
+ import os
diff --git a/debian/patches/libav9.patch b/debian/patches/libav9.patch
new file mode 100644
index 0000000..4eca27f
--- /dev/null
+++ b/debian/patches/libav9.patch
@@ -0,0 +1,9 @@
+Description: Fix compilation with libav 9
+Origin: upstream,
+ http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=bc976d74591a6f2c8a1e62f1c54691c281d21e00,
+ http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=52a07b454b93c14b7b0f51e9e71ae7b2b2d525fe,
+ http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=1967fef7709dccb5adaa6ac7f780a2e95f327c78,
+ http://vtk.org/gitweb?p=VTK.git;a=commitdiff;h=d48033e127b208228b46f820d454c5eca1c719e1
+Bug-Debian: http://bugs.debian.org/693639
+Last-Update: 2013-08-23
+
diff --git a/debian/patches/matplotlib.patch b/debian/patches/matplotlib.patch
new file mode 100644
index 0000000..776fbd0
--- /dev/null
+++ b/debian/patches/matplotlib.patch
@@ -0,0 +1,15 @@
+Index: vtk-6.0.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+===================================================================
+--- vtk-6.0.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h 2013-10-28 14:28:13.000000000 +0100
++++ vtk-6.0.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h 2013-10-28 14:30:17.000000000 +0100
+@@ -117,6 +117,10 @@
+ // Function used to check MPL availability and update MPLMathTextAvailable.
+ // This will do tests only the first time this method is called.
+ static void CheckMPLAvailability();
++ static void DisableMPL()
++ {
++ MPLMathTextAvailable = UNAVAILABLE;
++ };
+
+ private:
+ vtkMatplotlibMathTextUtilities(const vtkMatplotlibMathTextUtilities&); // Not implemented.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c07da52
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+allpatches.patch
+use_system_json.patch
+soversion-sharedlib.patch
+examples-add-shebang.patch
+vtkTclWrapper.patch
+vtkWrapJava.patch
+matplotlib.patch
+docs.patch
diff --git a/debian/patches/soversion-sharedlib.patch b/debian/patches/soversion-sharedlib.patch
new file mode 100644
index 0000000..ddc315f
--- /dev/null
+++ b/debian/patches/soversion-sharedlib.patch
@@ -0,0 +1,28 @@
+Index: vtk-6.0.0/CMake/vtkModuleMacros.cmake
+===================================================================
+--- vtk-6.0.0.orig/CMake/vtkModuleMacros.cmake 2013-10-18 12:01:15.000000000 +0200
++++ vtk-6.0.0/CMake/vtkModuleMacros.cmake 2013-10-18 12:01:25.000000000 +0200
+@@ -289,8 +289,8 @@
+ macro(vtk_target_name _name)
+ get_property(_type TARGET ${_name} PROPERTY TYPE)
+ if(NOT "${_type}" STREQUAL EXECUTABLE)
+- set_property(TARGET ${_name} PROPERTY VERSION 1)
+- set_property(TARGET ${_name} PROPERTY SOVERSION 1)
++ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION})
++ set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
+ endif()
+ if("${_name}" MATCHES "^[Vv][Tt][Kk]")
+ set(_vtk "")
+Index: vtk-6.0.0/Rendering/Tk/CMakeLists.txt
+===================================================================
+--- vtk-6.0.0.orig/Rendering/Tk/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Rendering/Tk/CMakeLists.txt 2013-10-18 14:58:14.000000000 +0200
+@@ -122,7 +122,7 @@
+ vtk_target_install(vtkRenderingPythonTkWidgets)
+
+ set_property(TARGET vtkRenderingPythonTkWidgets PROPERTY OUTPUT_NAME
+- vtkRenderingPythonTkWidgets-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
++ vtkRenderingPythonTkWidgets)
+
+ set(Module_PYTHON_LIBS ${VTK_TK_LIBRARIES})
+ if(VTK_USE_X)
diff --git a/debian/patches/use_system_json.patch b/debian/patches/use_system_json.patch
new file mode 100644
index 0000000..77a2081
--- /dev/null
+++ b/debian/patches/use_system_json.patch
@@ -0,0 +1,38 @@
+Description: Use packaged version of json instead of embedded one.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-06-13
+
+Index: vtk-6.0.0/IO/Geometry/module.cmake
+===================================================================
+--- vtk-6.0.0.orig/IO/Geometry/module.cmake 2013-10-16 14:47:46.000000000 +0200
++++ vtk-6.0.0/IO/Geometry/module.cmake 2013-10-16 14:47:46.000000000 +0200
+@@ -7,7 +7,6 @@
+ vtkCommonMisc
+ vtkIOCore
+ vtkzlib
+- vtkjsoncpp
+ TEST_DEPENDS
+ vtkIOAMR
+ vtkIOLegacy
+Index: vtk-6.0.0/IO/Geometry/CMakeLists.txt
+===================================================================
+--- vtk-6.0.0.orig/IO/Geometry/CMakeLists.txt 2013-10-16 14:47:46.000000000 +0200
++++ vtk-6.0.0/IO/Geometry/CMakeLists.txt 2013-10-16 14:47:46.000000000 +0200
+@@ -41,3 +41,4 @@
+ )
+
+ vtk_module_library(vtkIOGeometry ${Module_SRCS})
++target_link_libraries(vtkIOGeometry jsoncpp)
+Index: vtk-6.0.0/IO/Geometry/vtkPlot3DMetaReader.cxx
+===================================================================
+--- vtk-6.0.0.orig/IO/Geometry/vtkPlot3DMetaReader.cxx 2013-10-16 14:47:46.000000000 +0200
++++ vtk-6.0.0/IO/Geometry/vtkPlot3DMetaReader.cxx 2013-10-16 14:47:46.000000000 +0200
+@@ -32,7 +32,7 @@
+ #if defined(WIN32) && defined(VTK_BUILD_SHARED_LIBS)
+ # define JSON_DLL
+ #endif
+-#include <json/json.h>
++#include <jsoncpp/json/json.h>
+
+ #define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
+
diff --git a/debian/patches/vtkTclWrapper.patch b/debian/patches/vtkTclWrapper.patch
new file mode 100644
index 0000000..101b735
--- /dev/null
+++ b/debian/patches/vtkTclWrapper.patch
@@ -0,0 +1,16 @@
+Index: vtk-6.0.0/CMake/vtkTclWrapping.cmake
+===================================================================
+--- vtk-6.0.0.orig/CMake/vtkTclWrapping.cmake 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/CMake/vtkTclWrapping.cmake 2013-10-24 11:30:33.000000000 +0200
+@@ -46,6 +46,11 @@
+ foreach(dep ${${vtk-module}_LINK_DEPENDS})
+ if(NOT "${vtk-module}" STREQUAL "${dep}")
+ if(NOT ${dep}_EXCLUDE_FROM_WRAPPING)
++ if("${${dep}_TCL_NAME}" STREQUAL "")
++ #message(STATUS "Tcl libdepends for " ${vtk-module} " APPEND extra_links " ${dep} "->" ${${dep}_TCL_NAME}TCL)
++ #set(${dep}_TCL_NAME "${dep}")
++ vtk_module(${dep})
++ endif()
+ list(APPEND extra_links ${${dep}_TCL_NAME}TCL)
+ endif()
+ endif()
diff --git a/debian/patches/vtkWrapJava.patch b/debian/patches/vtkWrapJava.patch
new file mode 100644
index 0000000..ff1e553
--- /dev/null
+++ b/debian/patches/vtkWrapJava.patch
@@ -0,0 +1,232 @@
+Index: vtk-6.0.0/Wrapping/Tools/vtkWrapJava.c
+===================================================================
+--- vtk-6.0.0.orig/Wrapping/Tools/vtkWrapJava.c 2013-10-25 08:46:57.000000000 +0200
++++ vtk-6.0.0/Wrapping/Tools/vtkWrapJava.c 2013-10-25 08:46:57.000000000 +0200
+@@ -1251,8 +1251,31 @@
+
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
++ /* try to find if data->SuperClasses[i] is a template */
++ int template_class = 0;
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>'){
++ real_superclass[c] = '_';
++ template_class = 1;
++ }
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
++
++ /* if a template class is detected add a typedef */
++ if (template_class)
++ fprintf(fp,"typedef %s %s;\n",
++ data->SuperClasses[i], real_superclass);
++
+ fprintf(fp,"extern \"C\" JNIEXPORT void* %s_Typecast(void *op,char *dType);\n",
+- data->SuperClasses[i]);
++ real_superclass);
+ }
+
+ fprintf(fp,"\nextern \"C\" JNIEXPORT void* %s_Typecast(void *me,char *dType)\n{\n",data->Name);
+@@ -1264,8 +1287,22 @@
+ /* check our superclasses */
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>')
++ real_superclass[c] = '_';
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
++
+ fprintf(fp," if ((res= %s_Typecast(me,dType)) != NULL)",
+- data->SuperClasses[i]);
++ real_superclass);
+ fprintf(fp," { return res; }\n");
+ }
+ fprintf(fp," return NULL;\n");
+Index: vtk-6.0.0/Wrapping/Tools/vtkWrapTcl.c
+===================================================================
+--- vtk-6.0.0.orig/Wrapping/Tools/vtkWrapTcl.c 2013-06-12 21:47:10.000000000 +0200
++++ vtk-6.0.0/Wrapping/Tools/vtkWrapTcl.c 2013-10-25 08:54:19.000000000 +0200
+@@ -1115,7 +1115,30 @@
+
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
+- fprintf(fp,"int %sCppCommand(%s *op, Tcl_Interp *interp,\n int argc, char *argv[]);\n",data->SuperClasses[i],data->SuperClasses[i]);
++ /* try to find if data->SuperClasses[i] is a template */
++ int template_class = 0;
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>'){
++ real_superclass[c] = '_';
++ template_class = 1;
++ }
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
++
++ /* if a template class is detected add a typedef */
++ if (template_class)
++ fprintf(fp,"typedef %s %s;\n",
++ data->SuperClasses[i], real_superclass);
++
++ fprintf(fp,"int %sCppCommand(%s *op, Tcl_Interp *interp,\n int argc, char *argv[]);\n",real_superclass,real_superclass);
+ }
+ fprintf(fp,"int VTKTCL_EXPORT %sCppCommand(%s *op, Tcl_Interp *interp,\n int argc, char *argv[]);\n",data->Name,data->Name);
+ fprintf(fp,"\nint %sCommand(ClientData cd, Tcl_Interp *interp,\n int argc, char *argv[])\n{\n",data->Name);
+@@ -1156,8 +1179,25 @@
+ /* check our superclasses */
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
++ /* try to find if data->SuperClasses[i] is a template */
++ int template_class = 0;
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>'){
++ real_superclass[c] = '_';
++ template_class = 1;
++ }
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
+ fprintf(fp," if (%sCppCommand(static_cast<%s *>(op),interp,argc,argv) == TCL_OK)\n {\n",
+- data->SuperClasses[i],data->SuperClasses[i]);
++ real_superclass,data->SuperClasses[i]);
+ fprintf(fp," return TCL_OK;\n }\n");
+ }
+ fprintf(fp," }\n return TCL_ERROR;\n }\n\n");
+@@ -1191,8 +1231,25 @@
+ /* recurse up the tree */
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
++ /* try to find if data->SuperClasses[i] is a template */
++ int template_class = 0;
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>'){
++ real_superclass[c] = '_';
++ template_class = 1;
++ }
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
+ fprintf(fp," %sCppCommand(op,interp,argc,argv);\n",
+- data->SuperClasses[i]);
++ real_superclass);
+ }
+ /* now list our methods */
+ fprintf(fp," Tcl_AppendResult(interp,\"Methods from %s:\\n\",NULL);\n",data->Name);
+@@ -1256,8 +1313,25 @@
+ /* recurse up the tree */
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
++ /* try to find if data->SuperClasses[i] is a template */
++ int template_class = 0;
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>'){
++ real_superclass[c] = '_';
++ template_class = 1;
++ }
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
+ fprintf(fp," %sCppCommand(op,interp,argc,argv);\n",
+- data->SuperClasses[i]);
++ real_superclass);
+ /* append the result to our string */
+ fprintf(fp," Tcl_DStringGetResult ( interp, &dStringParent );\n" );
+ fprintf(fp," Tcl_DStringAppend ( &dString, Tcl_DStringValue ( &dStringParent ), -1 );\n" );
+@@ -1290,8 +1364,25 @@
+ /* recurse up the tree */
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
++ /* try to find if data->SuperClasses[i] is a template */
++ int template_class = 0;
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>'){
++ real_superclass[c] = '_';
++ template_class = 1;
++ }
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
+ fprintf(fp," SuperClassStatus = %sCppCommand(op,interp,argc,argv);\n",
+- data->SuperClasses[i]);
++ real_superclass);
+ fprintf(fp," if ( SuperClassStatus == TCL_OK ) { return TCL_OK; }\n" );
+ }
+ /* Now we handle it ourselves */
+@@ -1429,8 +1520,25 @@
+ /* try superclasses */
+ for (i = 0; i < data->NumberOfSuperClasses; i++)
+ {
++ /* try to find if data->SuperClasses[i] is a template */
++ int template_class = 0;
++ int l = strlen(data->SuperClasses[i]);
++ char * real_superclass = (char*) malloc(l+1);
++ memcpy(real_superclass, data->SuperClasses[i], l+1);
++
++ int c=0;
++ for (c=0; c<l; c++)
++ {
++ char p = data->SuperClasses[i][c];
++ if (p == '<' || p == '>'){
++ real_superclass[c] = '_';
++ template_class = 1;
++ }
++ if (p == ',' || p == ' ')
++ real_superclass[c] = '_';
++ }
+ fprintf(fp,"\n if (%sCppCommand(static_cast<%s *>(op),interp,argc,argv) == TCL_OK)\n",
+- data->SuperClasses[i], data->SuperClasses[i]);
++ real_superclass, data->SuperClasses[i]);
+ fprintf(fp," {\n return TCL_OK;\n }\n");
+ }
+
diff --git a/debian/python-vtk6.install b/debian/python-vtk6.install
index 454399a..3455140 100644
--- a/debian/python-vtk6.install
+++ b/debian/python-vtk6.install
@@ -1,2 +1,6 @@
usr/bin/vtkWrapPython-6.0
usr/bin/vtkWrapPythonInit-6.0
+
+debian/build/bin/vtkpython usr/bin
+debian/build/bin/pvtkpython usr/bin
+debian/build/bin/pvtk usr/bin
diff --git a/debian/rules b/debian/rules
index 93d539a..5f65d1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,27 @@
#!/usr/bin/make -f
BUILDDIR = $(CURDIR)/debian/build
+
+# export JAVA_HOME to help FindJava.cmake and FindJNI.cmake
+export JAVA_HOME=/usr/lib/jvm/default-java
+
%:
dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
+# Module_vtkjsoncpp:BOOL=OFF as we use A. Gladky patch to use system jsoncpp
+#
+# Module_vtkAcceleratorsPiston:BOOL=OFF as it requires CUDA
+#
+# Module_vtkIOGDAL:BOOL=OFF as it requires hdf5-serial-dev
+# cgal should be redebian/build against libhdf5-mpi-dev is possible
+#
+# Module_vtkInfovisParallel:BOOL=OFF as it relies on boost 1.40 - need to be patched
+#
+# Module_vtkmrmpi:BOOL=OFF why??
+# Module_vtkIOODBC:BOOL=OFF why??
+# Module_vtkIOPostgreSQL:BOOL=OFF why??
+
extra_flags += \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-DBUILD_DOCUMENTATION=ON \
-DBUILD_EXAMPLES=ON \
-DBUILD_SHARED_LIBS=ON \
@@ -28,7 +46,7 @@ extra_flags += \
-DVTK_Group_Qt=ON \
-DVTK_Group_Tk=ON \
-DVTK_Group_Views=ON \
- -DVTK_BUILD_ALL_MODULES=ON \
+ -DVTK_debian/build_ALL_MODULES=ON \
-DMPI_CXX_INCLUDE_PATH="/usr/include/mpi" \
-DVTK_INSTALL_LIBRARY_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -42,3 +60,12 @@ override_dh_auto_clean:
override_dh_link:
cd $(CURDIR)/debian ; rm -f python-vtk6.links ; ./generate_links.sh $(DEB_HOST_MULTIARCH)
dh_link
+
+override_dh_auto_build:
+ dh_auto_build
+
+ # Make doc (see wiki/VTK/debian/buildingDoxygen)
+ cd $(BUILDDIR) && make DoxygenDoc
+
+override_dh_shlibdeps:
+ dh_shlibdeps -a -l /usr/lib/jvm/default-java/lib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list