[vtk6] 03/06: Rename vtk.jar on vtk6.jar. (Closes: #737189)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository vtk6.

commit 582a7f7df58dfc72565afca1e7afe7c88ea7baac
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Jan 31 20:34:25 2014 +0100

    Rename vtk.jar on vtk6.jar. (Closes: #737189)
---
 debian/libvtk6-java.install |  2 +-
 debian/rules                | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/libvtk6-java.install b/debian/libvtk6-java.install
index 1d4eba9..c7256f0 100644
--- a/debian/libvtk6-java.install
+++ b/debian/libvtk6-java.install
@@ -1,3 +1,3 @@
 usr/bin/vtkWrapJava-6.0                     usr/bin
 usr/bin/vtkParseJava-6.0                    usr/bin
-usr/lib/*/vtk.jar                           usr/share/java
+usr/lib/*/vtk6.jar                           usr/share/java
diff --git a/debian/rules b/debian/rules
index c724b1c..eb19193 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,17 +8,6 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
 
 # Module_vtkjsoncpp:BOOL=OFF as we use A. Gladky patch to use system jsoncpp 
-#
-# Module_vtkAcceleratorsPiston:BOOL=OFF as it requires CUDA
-#
-# Module_vtkIOGDAL:BOOL=OFF as it requires hdf5-serial-dev
-#   cgal should be redebian/build against libhdf5-mpi-dev is possible
-#
-# Module_vtkInfovisParallel:BOOL=OFF as it relies on boost 1.40 - need to be patched
-#
-# Module_vtkmrmpi:BOOL=OFF why??
-# Module_vtkIOODBC:BOOL=OFF why??
-# Module_vtkIOPostgreSQL:BOOL=OFF why??
 
 extra_flags +=  \
  -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
@@ -74,6 +63,7 @@ override_dh_auto_install:
 	# Correct headers for paraview
 	perl -pi.bak -e "s|cxx|include|g" ThirdParty/netcdf/vtk_netcdfcpp.h
 	mv $(CURDIR)/debian/tmp/usr/bin/vtk $(CURDIR)/debian/tmp/usr/bin/vtk6
+	mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk6.jar
 	
 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