[vtk6] 01/01: Add missing JavaDependencies.cmake.in Add a link to vtkViewsContextIIDTCL.so

[Christophe Trophime]

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

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

commit f15dbee0d7e3681b09f36ec1ab170de6af41735b
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Tue Nov 5 10:36:33 2013 +0100

    Add missing JavaDependencies.cmake.in
    Add a link to vtkViewsContextIIDTCL.so
---
 debian/libvtk6-dev.install |    1 +
 debian/rules               |   10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/libvtk6-dev.install b/debian/libvtk6-dev.install
index 3429a93..9d88cff 100644
--- a/debian/libvtk6-dev.install
+++ b/debian/libvtk6-dev.install
@@ -11,6 +11,7 @@ CMake/vtkTesting*.cmake	usr/lib/cmake/vtk-6.0/
 CMake/vtkGroups.cmake usr/lib/cmake/vtk-6.0/
 CMake/TopologicalSort.cmake usr/lib/cmake/vtk-6.0/
 CMake/exportheader.cmake.in usr/lib/cmake/vtk-6.0/
+Wrapping/Java/JavaDependencies.cmake.in usr/lib/cmake/vtk-6.0/
 
 debian/build/ThirdParty/ftgl/vtkftglConfig.h usr/include/vtk-6.0/
 ThirdParty/ftgl/src/FTGL.h usr/include/vtk-6.0/
diff --git a/debian/rules b/debian/rules
index 23c79de..b33aea3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,7 @@ override_dh_auto_clean:
 
 override_dh_link:
 	cd $(CURDIR)/debian ; rm -f python-vtk6.links ; ./generate_links.sh $(DEB_HOST_MULTIARCH)
+	dh_link -ptcl-vtk6 usr/lib/$(DEB_HOST_MULTIARCH)/libvtkViewsContextIIDTCL-6.0.so usr/lib/$(DEB_HOST_MULTIARCH)/libvtkViewsContext2DTCL.so
 	dh_link
 
 override_dh_auto_build:
@@ -66,6 +67,15 @@ override_dh_auto_build:
 	
 	# Make doc (see wiki/VTK/debian/buildingDoxygen)
 	cd $(BUILDDIR) && make DoxygenDoc 
+
+override_dh_auto_install:
+	dh_auto_install -X.pyc -X.pyo
+
+	# Modify vtkWrapJava.cmake to properly upload JavaDependencies.cmake.in	from $VTK_DIR
+	perl -pi -e "s|{dir}/JavaDependencies.cmake.in\"|{VTK_DIR}/JavaDependencies.cmake.in\"|" debian/tmp/usr/lib/cmake/vtk-6.0/vtkWrapJava.cmake
+	
+	# Correct headers for paraview
+	perl -pi.bak -e "s|cxx|include|g" ThirdParty/netcdf/vtk_netcdfcpp.h
 	
 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