[vtk6] 05/06: New upstream version 6.3.0, Closes: #805010

Gert Wollny gert-guest at moszumanska.debian.org
Tue Apr 5 14:28:41 UTC 2016 

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

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

commit 52932315b6beef1e86b7e20b9ba48c62542e1464
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Apr 5 09:45:00 2016 +0000

    New upstream version 6.3.0, Closes: #805010
    
    * Split native java paackages out of the -java into the -jni package
      as required by the java policy. Related to #773422. An autopkgtest
      is still missing though, therefore I don't close this bug.
    * Enable system proj4 library, Closes: #750184
---
 debian/control                                     | 40 ++++++++++++++------
 debian/libvtk6-dev.install                         | 44 +++++++++++-----------
 debian/libvtk6-java.install                        |  6 +--
 debian/libvtk6-jni.install                         |  1 +
 debian/libvtk6-jni.lintian-overrides               |  3 ++
 debian/libvtk6-qt-dev.install                      |  6 +--
 debian/libvtk6.2-qt.lintian-overrides              |  3 --
 debian/libvtk6.2.lintian-overrides                 |  5 ---
 .../{libvtk6.2-qt.install => libvtk6.3-qt.install} |  0
 debian/libvtk6.3-qt.lintian-overrides              |  3 ++
 debian/{libvtk6.2.install => libvtk6.3.install}    |  0
 debian/libvtk6.3.lintian-overrides                 |  5 +++
 debian/python-vtk6.install                         |  4 +-
 debian/rules                                       | 13 ++++---
 debian/tcl-vtk6.install                            |  4 +-
 debian/vtk6-doc.docs                               |  2 +-
 debian/vtk6.install                                | 10 ++---
 17 files changed, 86 insertions(+), 63 deletions(-)

diff --git a/debian/control b/debian/control
index 2404d87..0b6f13c 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,8 @@ Build-Depends: chrpath,
                libogg-dev,
                libosmesa6-dev,
                libpng-dev,
-               libpq-dev,
+	       libpq-dev,
+	       libproj-dev,  
                libqt5opengl5-dev,
                libqt5webkit5-dev,
                libsqlite3-dev,
@@ -103,11 +104,12 @@ Depends: libavcodec-dev,
          libogg-dev,
          libpng-dev,
          libpq-dev,
+	 libproj-dev, 
          libpython-dev,
          libswscale-dev,
          libtheora-dev,
          libtiff-dev,
-         libvtk6.2 (= ${binary:Version}),
+         libvtk6.3 (= ${binary:Version}),
          libvtk6-java (= ${binary:Version}),
          libx11-dev,
          libxft-dev,
@@ -146,8 +148,8 @@ Depends: libvtk6-dev (= ${binary:Version}),
          qttools5-private-dev,
          libqt5opengl5-dev,
          libqt5webkit5-dev
-Breaks: libvtk6-dev (<< 6.2.0+dfsg1-4)
-Replaces: libvtk6-dev (<< 6.2.0+dfsg1-4)
+Breaks: libvtk6-dev (<< 6.3.0+dfsg1)
+Replaces: libvtk6-dev (<< 6.3.0+dfsg1)
 Description: VTK header files, containing Qt files
  The Visualization Toolkit (VTK) is an open-source software system
  for 3D computer graphics, image processing, and visualization.
@@ -155,7 +157,7 @@ Description: VTK header files, containing Qt files
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation. Qt files
 
-Package: libvtk6.2
+Package: libvtk6.3
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -173,7 +175,7 @@ Description: VTK libraries
  This package provides the shared libraries needed to run C++ programs
  that use VTK.
 
-Package: libvtk6.2-qt
+Package: libvtk6.3-qt
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -187,9 +189,25 @@ 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
+Depends:
+ ${java:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libvtk6-java (<< 6.3.0+dfsg1-1)
+Section: java
+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
 Depends:
+ libvtk6-jni (= ${binary:Version}),
  ${java:Depends},
  ${misc:Depends},
  ${shlibs:Depends}
@@ -209,8 +227,8 @@ Description: Visualization Toolkit - A high level 3D visualization library - jav
 Package: python-vtk6
 Architecture: any
 Section: python
-Depends: libvtk6.2 (= ${binary:Version}),
-	 libvtk6.2-qt (= ${binary:Version}),
+Depends: libvtk6.3 (= ${binary:Version}),
+	 libvtk6.3-qt (= ${binary:Version}),
 	 python-autobahn,
          python-mpi4py,
          python-six,
@@ -232,8 +250,8 @@ Description: Python bindings for VTK
 Package: tcl-vtk6
 Architecture: any
 Section: interpreters
-Depends: libvtk6.2 (= ${binary:Version}),
-	 libvtk6.2-qt (= ${binary:Version}),
+Depends: libvtk6.3 (= ${binary:Version}),
+	 libvtk6.3-qt (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: vtk6-doc,
@@ -248,7 +266,7 @@ Description: Tcl bindings for VTK
 Package: vtk6
 Architecture: any
 Section: interpreters
-Depends: libvtk6.2 (= ${binary:Version}),
+Depends: libvtk6.3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: vtk6-doc,
diff --git a/debian/libvtk6-dev.install b/debian/libvtk6-dev.install
index fae6068..bd5aa5d 100644
--- a/debian/libvtk6-dev.install
+++ b/debian/libvtk6-dev.install
@@ -2,26 +2,26 @@
 # to get paraview debian/build properly on top of vtk we now add this as a symlink 
 # in the python-vtk6 package 
 # /usr/lib/*/python2.7/site-packages/vtk/*
-CMake/TopologicalSort.cmake usr/lib/cmake/vtk-6.2/
-CMake/exportheader.cmake.in usr/lib/cmake/vtk-6.2/
-CMake/vtkGroups.cmake usr/lib/cmake/vtk-6.2/
-CMake/vtkTesting*.cmake	usr/lib/cmake/vtk-6.2/
-Common/Core/vtkPointAccumulator.hxx usr/include/vtk-6.2/
-Common/DataModel/vtkMarchingCubesCases.h usr/include/vtk-6.2/
-Filters/Statistics/vtkStatisticsAlgorithmPrivate.h usr/include/vtk-6.2/
-IO/Import/vtk3DS.h usr/include/vtk-6.2/
-Testing/Core/vtkTestDriver.h usr/include/vtk-6.2
-Testing/Core/vtkTestUtilities.h usr/include/vtk-6.2/
-Testing/Core/vtkTesting*.h usr/include/vtk-6.2
-Testing/Rendering/vtkRegressionTestImage.h usr/include/vtk-6.2/
-Testing/Rendering/vtkTesting*.h usr/include/vtk-6.2
-ThirdParty/ftgl/src/FTGL.h usr/include/vtk-6.2/
-Wrapping/Java/JavaDependencies.cmake.in usr/lib/cmake/vtk-6.2/
-debian/build/ThirdParty/ftgl/vtkftglConfig.h usr/include/vtk-6.2/
-debian/build/ThirdParty/netcdf/vtk_netcdf.h usr/include/vtk-6.2/
-debian/build/ThirdParty/netcdf/vtk_netcdfcpp.h usr/include/vtk-6.2/
-debian/build/lib/cmake/vtk-6.2/Modules/*-Headers.cmake	usr/lib/cmake/vtk-6.2/Modules/
-usr/include/vtk-6.2                    usr/include
+CMake/TopologicalSort.cmake usr/lib/cmake/vtk-6.3/
+CMake/exportheader.cmake.in usr/lib/cmake/vtk-6.3/
+CMake/vtkGroups.cmake usr/lib/cmake/vtk-6.3/
+CMake/vtkTesting*.cmake	usr/lib/cmake/vtk-6.3/
+Common/Core/vtkPointAccumulator.hxx usr/include/vtk-6.3/
+Common/DataModel/vtkMarchingCubesTriangleCases.h usr/include/vtk-6.3/
+Filters/Statistics/vtkStatisticsAlgorithmPrivate.h usr/include/vtk-6.3/
+IO/Import/vtk3DS.h usr/include/vtk-6.3/
+Testing/Core/vtkTestDriver.h usr/include/vtk-6.3
+Testing/Core/vtkTestUtilities.h usr/include/vtk-6.3/
+Testing/Core/vtkTesting*.h usr/include/vtk-6.3
+Testing/Rendering/vtkRegressionTestImage.h usr/include/vtk-6.3/
+Testing/Rendering/vtkTesting*.h usr/include/vtk-6.3
+ThirdParty/ftgl/src/FTGL.h usr/include/vtk-6.3/
+Wrapping/Java/JavaDependencies.cmake.in usr/lib/cmake/vtk-6.3/
+debian/build/ThirdParty/ftgl/vtkftglConfig.h usr/include/vtk-6.3/
+debian/build/ThirdParty/netcdf/vtk_netcdf.h usr/include/vtk-6.3/
+debian/build/ThirdParty/netcdf/vtk_netcdfcpp.h usr/include/vtk-6.3/
+debian/build/lib/cmake/vtk-6.3/Modules/*-Headers.cmake	usr/lib/cmake/vtk-6.3/Modules/
+usr/include/vtk-6.3                    usr/include
 usr/lib/*/*.so
-usr/lib/cmake/vtk-6.2
-usr/share/doc/vtk-6.2/doxygen/* /usr/share/vtk-6.2/doxygen/
+usr/lib/cmake/vtk-6.3
+usr/share/doc/vtk-6.3/doxygen/* /usr/share/vtk-6.3/doxygen/
diff --git a/debian/libvtk6-java.install b/debian/libvtk6-java.install
index 405c0d3..0f158c0 100644
--- a/debian/libvtk6-java.install
+++ b/debian/libvtk6-java.install
@@ -1,5 +1,5 @@
-usr/bin/vtkParseJava-6.2                    usr/bin
-usr/bin/vtkWrapJava-6.2                     usr/bin
+usr/bin/vtkParseJava-6.3                    usr/bin
+usr/bin/vtkWrapJava-6.3                     usr/bin
 usr/lib/*/vtk6.jar                          usr/share/java
-usr/lib/*/jni/                      
+
 
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..2307559
--- /dev/null
+++ b/debian/libvtk6-jni.lintian-overrides
@@ -0,0 +1,3 @@
+
+#
+libvtk6-jni: hardening-no-relro
diff --git a/debian/libvtk6-qt-dev.install b/debian/libvtk6-qt-dev.install
index 1d6b20a..2c81ec4 100644
--- a/debian/libvtk6-qt-dev.install
+++ b/debian/libvtk6-qt-dev.install
@@ -1,6 +1,6 @@
 # remove Python files here and privide a symlink in the python package 
 # usr/lib/*/python2.7/site-packages/vtk/*Qt*
 usr/lib/*/*Qt*.so
-usr/lib/cmake/vtk-6.2/Modules/*Qt*
-usr/include/vtk-6.2/*Qt*
-usr/include/vtk-6.2/Q*
+usr/lib/cmake/vtk-6.3/Modules/*Qt*
+usr/include/vtk-6.3/*Qt*
+usr/include/vtk-6.3/Q*
diff --git a/debian/libvtk6.2-qt.lintian-overrides b/debian/libvtk6.2-qt.lintian-overrides
deleted file mode 100644
index 2c1318d..0000000
--- a/debian/libvtk6.2-qt.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libvtk6.2-qt: hardening-no-relro
-libvtk6.2-qt: package-name-doesnt-match-sonames
-
diff --git a/debian/libvtk6.2.lintian-overrides b/debian/libvtk6.2.lintian-overrides
deleted file mode 100644
index ec6de0e..0000000
--- a/debian/libvtk6.2.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libvtk6.2: package-name-doesnt-match-sonames
-libvtk6.2: hardening-no-relro
-# Will be discussed with upstream to have an opportunity to set USE_SYSTEM_lib
-
-libvtk6.2: embedded-library
diff --git a/debian/libvtk6.2-qt.install b/debian/libvtk6.3-qt.install
similarity index 100%
rename from debian/libvtk6.2-qt.install
rename to debian/libvtk6.3-qt.install
diff --git a/debian/libvtk6.3-qt.lintian-overrides b/debian/libvtk6.3-qt.lintian-overrides
new file mode 100644
index 0000000..9d8522a
--- /dev/null
+++ b/debian/libvtk6.3-qt.lintian-overrides
@@ -0,0 +1,3 @@
+libvtk6.3-qt: hardening-no-relro
+libvtk6.3-qt: package-name-doesnt-match-sonames
+
diff --git a/debian/libvtk6.2.install b/debian/libvtk6.3.install
similarity index 100%
rename from debian/libvtk6.2.install
rename to debian/libvtk6.3.install
diff --git a/debian/libvtk6.3.lintian-overrides b/debian/libvtk6.3.lintian-overrides
new file mode 100644
index 0000000..3810c82
--- /dev/null
+++ b/debian/libvtk6.3.lintian-overrides
@@ -0,0 +1,5 @@
+libvtk6.3: package-name-doesnt-match-sonames
+libvtk6.3: hardening-no-relro
+# Will be discussed with upstream to have an opportunity to set USE_SYSTEM_lib
+
+libvtk6.3: embedded-library
diff --git a/debian/python-vtk6.install b/debian/python-vtk6.install
index 1623c46..b7aae62 100644
--- a/debian/python-vtk6.install
+++ b/debian/python-vtk6.install
@@ -1,8 +1,8 @@
 debian/build/bin/pvtk				 usr/bin
 debian/build/bin/pvtkpython	 usr/bin
 debian/build/bin/vtk6python	 usr/bin
-usr/bin/vtkWrapPython-6.2
-usr/bin/vtkWrapPythonInit-6.2
+usr/bin/vtkWrapPython-6.3
+usr/bin/vtkWrapPythonInit-6.3
 usr/lib/*/python2.7/site-packages/vtk usr/lib/python2.7/dist-packages
 usr/lib/*/libvtkRenderingPythonTkWidgets.so usr/lib/python2.7/dist-packages/vtk/
 
diff --git a/debian/rules b/debian/rules
index 19c6646..e968ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ extra_flags +=  \
 	-DVTK_USE_SYSTEM_HDF5=ON \
         -DHDF5_PREFER_PARALLEL=ON \
 	-DVTK_USE_SYSTEM_JPEG=ON \
-	-DVTK_USE_SYSTEM_LIBPROJ4=OFF \
+	-DVTK_USE_SYSTEM_LIBPROJ4=ON \
 	-DVTK_USE_SYSTEM_LIBXML2=ON \
 	-DVTK_USE_SYSTEM_OGGTHEORA=ON \
 	-DVTK_USE_SYSTEM_PNG=ON \
@@ -74,29 +74,30 @@ override_dh_auto_build:
 	find $(BUILDDIR)/Utilities/Doxygen/doc/html/ -name "*.md5" | xargs rm -f
 
 override_dh_auto_install:
+	pwd
 	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.2/vtkWrapJava.cmake
+	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.2/VTKTargets.cmake
+	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.2/pkgIndex.tcl
+	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
 	find $(CURDIR)/debian/libvtk6-dev/ -name "*Qt*" -exec rm {} \;
-	find $(CURDIR)/debian/libvtk6.2/ -name "*Qt*" -exec rm {} \;
+	find $(CURDIR)/debian/libvtk6.3/ -name "*Qt*" -exec rm {} \;
 	find $(CURDIR)/debian/libvtk6-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \;
 	find $(CURDIR)/debian/libvtk6-dev/usr/include/ -name "Q*" -exec rm {} \;
-	chmod 755 $(CURDIR)/debian/libvtk6-dev/usr/share/vtk-6.2/doxygen/*.pl
+	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/ && \
diff --git a/debian/tcl-vtk6.install b/debian/tcl-vtk6.install
index 5f84238..0697969 100644
--- a/debian/tcl-vtk6.install
+++ b/debian/tcl-vtk6.install
@@ -1,3 +1,3 @@
-usr/bin/vtkWrapTcl-6.2
-usr/bin/vtkWrapTclInit-6.2
+usr/bin/vtkWrapTcl-6.3
+usr/bin/vtkWrapTclInit-6.3
 usr/lib/tcltk
diff --git a/debian/vtk6-doc.docs b/debian/vtk6-doc.docs
index ec7d98d..f1ced18 100644
--- a/debian/vtk6-doc.docs
+++ b/debian/vtk6-doc.docs
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/vtk-6.2/doxygen
+debian/tmp/usr/share/doc/vtk-6.3/doxygen
 debian/build/Utilities/Doxygen/doc/html
diff --git a/debian/vtk6.install b/debian/vtk6.install
index 906d296..f1918be 100644
--- a/debian/vtk6.install
+++ b/debian/vtk6.install
@@ -1,6 +1,6 @@
 usr/bin/vtk6
-usr/bin/vtkEncodeString-6.2
-usr/bin/vtkHashSource-6.2
-usr/bin/vtkParseOGLExt-6.2
-usr/bin/vtkWrapHierarchy-6.2
-usr/lib/libvtkWrappingTools-6.2.a
+usr/bin/vtkEncodeString-6.3
+usr/bin/vtkHashSource-6.3
+usr/bin/vtkParseOGLExt-6.3
+usr/bin/vtkWrapHierarchy-6.3
+usr/lib/libvtkWrappingTools-6.3.a

-- 
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