[vtk6] 01/02: Revert dropping of language bindings.
Gert Wollny
gewo at moszumanska.debian.org
Fri Jul 7 15:20:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository vtk6.
commit 089328b2776668e4517274a21aab7259053ebd9f
Author: Gert Wollny <gewo at debian.org>
Date: Fri Jul 7 13:32:35 2017 +0000
Revert dropping of language bindings.
This reverts commit 7628c406af881b409e91ba2fc49c11d1c964ec3b.
---
debian/control | 130 +++++++++++++++++++++++++++++++++-
debian/libvtk6-java.install | 3 +
debian/libvtk6-java.lintian-overrides | 3 +
debian/libvtk6-jni.install | 1 +
debian/libvtk6-jni.lintian-overrides | 1 +
debian/patches/series | 4 +-
debian/python-vtk6.pyinstall | 7 ++
debian/rules | 29 +++++---
debian/tcl-vtk6.install | 3 +
debian/tcl-vtk6.lintian-overrides | 3 +
debian/vtk6-examples.examples | 1 +
11 files changed, 172 insertions(+), 13 deletions(-)
diff --git a/debian/control b/debian/control
index 5f014d7..e75665f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: chrpath,
debhelper (>= 9),
default-jdk,
default-libmysqlclient-dev,
+ dh-python,
ftgl-dev,
hdf5-tools,
javahelper,
@@ -51,8 +52,20 @@ Build-Depends: chrpath,
libxt-dev,
mpi-default-dev,
pkg-config,
+ python-all-dev (<< 2.8),
+ python-all-dev,
+ python-autobahn,
+ python-matplotlib,
+ python-mpi4py,
+ python-six,
+ python-twisted,
qtbase5-dev,
qttools5-private-dev,
+ r-base,
+ r-base-core,
+ r-base-dev,
+ tcl-dev,
+ tk-dev,
x11proto-core-dev,
xauth,
xvfb,
@@ -92,21 +105,30 @@ Depends: default-libmysqlclient-dev,
libpng-dev,
libpq-dev,
libproj-dev,
+ libpython-dev,
libswscale-dev,
libtheora-dev,
libtiff-dev,
libvtk6.3 (= ${binary:Version}),
+ libvtk6-java (= ${binary:Version}),
libx11-dev,
libxft-dev,
libxml2-dev,
libxss-dev,
libxt-dev,
mpi-default-dev,
+ python-vtk6 (= ${binary:Version}),
+ python-zope.interface,
+ tcl-dev,
+ tcl-vtk6 (= ${binary:Version}),
+ tk-dev,
+ vtk6 (= ${binary:Version}),
x11proto-core-dev,
zlib1g-dev,
${misc:Depends},
${shlibs:Depends}
-Suggests: vtk6-doc
+Suggests: vtk6-doc,
+ vtk6-examples
Conflicts: libvtk5-dev
Replaces: libvtk5-dev
Description: VTK header files
@@ -142,7 +164,8 @@ Section: libs
Depends: ${misc:Depends},
${shlibs:Depends}
Suggests: mpi-default-bin,
- vtk6-doc
+ vtk6-doc,
+ vtk6-examples
Conflicts: libvtk6 (>> 6.0.0-7)
Replaces: libvtk5.8,
libvtk6
@@ -167,16 +190,117 @@ Description: VTK libraries, Qt files
This package provides the shared libraries needed to run C++ programs
that use VTK. Qt files
+Package: libvtk6-jni
+Architecture: any
+Section: java
+Depends: ${java:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libvtk6-java (<< 6.3.0+dfsg1-1~exp1)
+Description: Visualization Toolkit - A high level 3D visualization library - java
+ The Visualization Toolkit (VTK) is an object oriented, high level
+ library that allows one to easily write C++ programs, Tcl, Python and
+ Java scripts that do 3D visualization.
+ .
+ This package provides the VTK Java language support.
+
+Package: libvtk6-java
+Architecture: any
+Section: java
+Depends: libvtk6-jni (= ${binary:Version}),
+ ${java:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: java-virtual-machine,
+ libvtk6-dev (= ${binary:Version}),
+ vtk6-doc,
+ vtk6-examples
+Description: Visualization Toolkit - A high level 3D visualization library - java
+ The Visualization Toolkit (VTK) is an object oriented, high level
+ library that allows one to easily write C++ programs, Tcl, Python and
+ Java scripts that do 3D visualization.
+ .
+ This package provides the VTK Java language support.
+
+Package: python-vtk6
+Architecture: any
+Section: python
+Depends: libvtk6.3 (= ${binary:Version}),
+ libvtk6.3-qt (= ${binary:Version}),
+ python-autobahn,
+ python-mpi4py,
+ python-six,
+ python-twisted,
+ python-zope.interface,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Suggests: mayavi2,
+ vtk6-doc,
+ vtk6-examples
+Conflicts: python-vtk
+Description: Python bindings for VTK
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides the python bindings for VTK.
+
+Package: tcl-vtk6
+Architecture: any
+Section: interpreters
+Depends: libvtk6.3 (= ${binary:Version}),
+ libvtk6.3-qt (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: vtk6-doc,
+ vtk6-examples
+Description: Tcl bindings for VTK
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides the shared libraries and executable that enable
+ one to use VTK from Tcl/Tk scripts.
+
+Package: vtk6
+Architecture: any
+Section: interpreters
+Depends: libvtk6.3 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: vtk6-doc,
+ vtk6-examples
+Description: Binaries for VTK6
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides binaries for VTK6
+
Package: vtk6-doc
Architecture: all
Section: doc
Depends: doc-base,
libjs-jquery,
${misc:Depends}
-Suggests: libvtk6-dev
+Suggests: libvtk6-dev,
+ vtk6-examples
Description: VTK class reference documentation
The Visualization Toolkit (VTK) is an open-source software system
for 3D computer graphics, image processing, and visualization.
.
This package provides documentation for VTK6
+Package: vtk6-examples
+Architecture: all
+Section: graphics
+Depends: ${misc:Depends}
+Suggests: libvtk6-dev,
+ python,
+ python-vtk6,
+ tcl-vtk6,
+ tclsh,
+ vtk6-doc
+Description: VTK examples
+ The Visualization Toolkit (VTK) is an open-source software system
+ for 3D computer graphics, image processing, and visualization.
+ .
+ This package provides examples for VTK6
diff --git a/debian/libvtk6-java.install b/debian/libvtk6-java.install
new file mode 100644
index 0000000..8a7c40f
--- /dev/null
+++ b/debian/libvtk6-java.install
@@ -0,0 +1,3 @@
+usr/bin/vtkParseJava-6.3 usr/bin
+usr/bin/vtkWrapJava-6.3 usr/bin
+usr/lib/*/vtk6.jar usr/share/java
diff --git a/debian/libvtk6-java.lintian-overrides b/debian/libvtk6-java.lintian-overrides
new file mode 100644
index 0000000..3a50736
--- /dev/null
+++ b/debian/libvtk6-java.lintian-overrides
@@ -0,0 +1,3 @@
+# Upstream does not provide manpages
+libvtk6-java: binary-without-manpage
+libvtk6-java: hardening-no-relro
diff --git a/debian/libvtk6-jni.install b/debian/libvtk6-jni.install
new file mode 100644
index 0000000..249b773
--- /dev/null
+++ b/debian/libvtk6-jni.install
@@ -0,0 +1 @@
+usr/lib/*/jni/
\ No newline at end of file
diff --git a/debian/libvtk6-jni.lintian-overrides b/debian/libvtk6-jni.lintian-overrides
new file mode 100644
index 0000000..480e78b
--- /dev/null
+++ b/debian/libvtk6-jni.lintian-overrides
@@ -0,0 +1 @@
+libvtk6-jni: hardening-no-relro
diff --git a/debian/patches/series b/debian/patches/series
index ab10794..0a7e621 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,8 +9,8 @@
90_gdal-2.0.patch
95_ffmpeg_2.9.patch
97_fix_latex_doxygen.patch
-#100_javac-heap.patch
-#101_java_install_path.patch
+100_javac-heap.patch
+101_java_install_path.patch
102_enable_system_proj4_lib.patch
104_fix_gcc_version_6.patch
105_unforce_embedded_glew.patch
diff --git a/debian/python-vtk6.pyinstall b/debian/python-vtk6.pyinstall
new file mode 100644
index 0000000..80139d7
--- /dev/null
+++ b/debian/python-vtk6.pyinstall
@@ -0,0 +1,7 @@
+debian/build/Wrapping/Python/vtk/*.py vtk
+debian/build/Wrapping/Python/vtk/gtk/*.py vtk.gtk
+debian/build/Wrapping/Python/vtk/qt4/*.py vtk.qt4
+debian/build/Wrapping/Python/vtk/test/*.py vtk.test
+debian/build/Wrapping/Python/vtk/tk/*.py vtk.tk
+debian/build/Wrapping/Python/vtk/util/*.py vtk.util
+debian/build/Wrapping/Python/vtk/wx/*.py vtk.wx
diff --git a/debian/rules b/debian/rules
index a844f9c..bb0e5e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ endif
export JAVA_HOME=/usr/lib/jvm/default-java
%:
- dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
+ dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
extra_flags += \
-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -22,10 +22,10 @@ extra_flags += \
-DBUILD_EXAMPLES=ON \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
- -DVTK_USE_TK=OFF \
- -DVTK_WRAP_JAVA=OFF \
- -DVTK_WRAP_PYTHON=OFF \
- -DVTK_WRAP_TCL=OFF \
+ -DVTK_USE_TK=ON \
+ -DVTK_WRAP_JAVA=ON \
+ -DVTK_WRAP_PYTHON=ON \
+ -DVTK_WRAP_TCL=ON \
-DVTK_USE_SYSTEM_EXPAT=ON \
-DVTK_USE_SYSTEM_FREETYPE=ON \
-DVTK_USE_SYSTEM_GL2PS=ON \
@@ -85,10 +85,20 @@ override_dh_auto_build-arch:
override_dh_auto_install:
pwd
dh_auto_install -X.pyc -X.pyo
-
- # Correct headers for paraview
- perl -pi.bak -e "s|cxx|include|g" $(CURDIR)/debian/build/ThirdParty/netcdf/vtk_netcdfcpp.h
+ # 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.3/vtkWrapJava.cmake
+ # Correct headers for paraview
+ perl -pi.bak -e "s|cxx|include|g" ThirdParty/netcdf/vtk_netcdfcpp.h
+ mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk6.jar
+ mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk6python
sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/cmake/vtk-6.3/VTKTargets.cmake
+ chrpath -d $(CURDIR)/debian/build/bin/vtk6python
+ chrpath -d $(CURDIR)/debian/build/bin/pvtk
+ chrpath -d $(CURDIR)/debian/build/bin/pvtkpython
+ mv $(CURDIR)/debian/tmp/usr/bin/vtk $(CURDIR)/debian/tmp/usr/bin/vtk6
+ find $(CURDIR)/debian/tmp/ -name "*.pyc" | xargs rm -f
+ find $(CURDIR)/debian/tmp/ -name "*.pyo" | xargs rm -f
+ sed -i -e "9 a\ append libPath /${DEB_HOST_MULTIARCH}" $(CURDIR)/debian/tmp/usr/lib/tcltk/vtk-6.3/pkgIndex.tcl
override_dh_install-arch:
dh_install -a
@@ -98,3 +108,6 @@ override_dh_install-arch:
find $(CURDIR)/debian/libvtk6-dev/usr/include/ -name "Q*" -exec rm {} \;
chmod 755 $(CURDIR)/debian/libvtk6-dev/usr/share/vtk-6.3/doxygen/*.pl
rm -rf $(CURDIR)/debian/libvtk6-doc/usr/share/doc/vtk6-doc/html/_formulas.log
+ mkdir -p $(CURDIR)/debian/python-vtk6/usr/lib/$(DEB_HOST_MULTIARCH)/python2.7/site-packages/ && \
+ cd $(CURDIR)/debian/python-vtk6/usr/lib/$(DEB_HOST_MULTIARCH)/python2.7/site-packages/ && \
+ ln -s /usr/lib/python2.7/dist-packages/vtk vtk
diff --git a/debian/tcl-vtk6.install b/debian/tcl-vtk6.install
new file mode 100644
index 0000000..0697969
--- /dev/null
+++ b/debian/tcl-vtk6.install
@@ -0,0 +1,3 @@
+usr/bin/vtkWrapTcl-6.3
+usr/bin/vtkWrapTclInit-6.3
+usr/lib/tcltk
diff --git a/debian/tcl-vtk6.lintian-overrides b/debian/tcl-vtk6.lintian-overrides
new file mode 100644
index 0000000..7d6280f
--- /dev/null
+++ b/debian/tcl-vtk6.lintian-overrides
@@ -0,0 +1,3 @@
+# Upstream does not provide manpages
+tcl-vtk6: binary-without-manpage
+tcl-vtk6: hardening-no-relro
diff --git a/debian/vtk6-examples.examples b/debian/vtk6-examples.examples
new file mode 100644
index 0000000..a8d52f4
--- /dev/null
+++ b/debian/vtk6-examples.examples
@@ -0,0 +1 @@
+Examples/
--
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