[vtk6] 02/12: Update Java installation locations

[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 7f90dea5a678c2804752b6fb27e7c42e6c84e0ab
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Feb 16 17:40:31 2016 +0000

    Update Java installation locations
---
 debian/changelog            | 4 ----
 debian/libvtk6-java.install | 4 +++-
 debian/rules                | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c5468e..2e6da44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 vtk6 (6.2.0+dfsg1-8) UNRELEASED; urgency=medium
 
-  * [e2667e8] d/libvtk6-qt-dev: also install QT*.so files 
-    (needed by vtk-dicom)
-  * update changelog
-  * update changelog
 
  -- Gert Wollny <gw.fossdev at gmail.com>  Wed, 03 Feb 2016 15:05:29 +0000
 
diff --git a/debian/libvtk6-java.install b/debian/libvtk6-java.install
index b16778c..d4798c6 100644
--- a/debian/libvtk6-java.install
+++ b/debian/libvtk6-java.install
@@ -1,3 +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/*/vtk6.jar                          usr/share/java
+usr/lib/*/*Java.so                          usr/lib/jni
+
diff --git a/debian/rules b/debian/rules
index bf8f7a3..8cad17f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,5 +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-qt-dev/ -name "*Java.so" -exec rm {} \;
 	find $(CURDIR)/debian/libvtk6-dev/usr/include/ -name "Q*" -exec rm {} \;
 	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