[vtk6] 01/12: Correct install path for Java file within the build system

[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 81e7008891089ccf0a69b1c2820cf4df2b193aef
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sat Mar 26 16:13:11 2016 +0000

    Correct install path for Java file within the build system
    
    On Debian native Java modules go to /usr/lib/<triple>/jni.
    A patch has been added to make do this from within vtk
    to get a correct cmake output and also make it easier to create
    the according package.
---
 debian/libvtk6-java.install                |  2 +-
 debian/patches/101_java_install_path.patch | 19 +++++++++++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               |  2 --
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/libvtk6-java.install b/debian/libvtk6-java.install
index d4798c6..405c0d3 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/lib/*/vtk6.jar                          usr/share/java
-usr/lib/*/*Java.so                          usr/lib/jni
+usr/lib/*/jni/                      
 
diff --git a/debian/patches/101_java_install_path.patch b/debian/patches/101_java_install_path.patch
new file mode 100644
index 0000000..5da0e36
--- /dev/null
+++ b/debian/patches/101_java_install_path.patch
@@ -0,0 +1,19 @@
+Description: Install Java modules in the correct path
+ This patch corrects the installation of the native Java modules
+ to go to the path given by the Debian Java Policy. This helps
+ to later use the simple install file to get them to the right
+ location in the package. 
+Author: Gert Wollny <gw.fossdev at gmail.com
+Last-Update: 2016-03-26
+
+--- a/CMake/vtkJavaWrapping.cmake
++++ b/CMake/vtkJavaWrapping.cmake
+@@ -79,7 +79,7 @@
+     install(TARGETS ${module_name}Java
+       EXPORT ${VTK_INSTALL_EXPORT_NAME}
+       RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
+-      LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
++      LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR}/jni COMPONENT RuntimeLibraries
+       ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development)
+   endif()
+ endfunction()
diff --git a/debian/patches/series b/debian/patches/series
index 43eaa7c..e4c5eb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 96_concurrent_vtkLookupTableMapData_fix.patch
 97_fix_latex_doxygen.patch
 100_javac-heap.patch
+101_java_install_path.patch
diff --git a/debian/rules b/debian/rules
index 80443df..b27ab0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,9 +96,7 @@ 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-dev/ -name "*Java.so" -exec rm {} \;
 	find $(CURDIR)/debian/libvtk6-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \;
-	find $(CURDIR)/debian/libvtk6-qt-dev/ -name "*Java.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
 	rm -rf $(CURDIR)/debian/libvtk6-doc/usr/share/doc/vtk6-doc/html/_formulas.log

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