Bug#774646: unblock: vtk6/debian/6.1.0+dfsg2-5

[Anton Gladky <gladk@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package vtk6

this uploads fixes a RC-bug #773424 and removes a binary libvtk6-java.
(Closes: #773422).

Diff is attached.

unblock vtk6/debian/6.1.0+dfsg2-5

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)

diff --git a/debian/changelog b/debian/changelog
index 76af8ad..48fb47f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vtk6 (6.1.0+dfsg2-5) unstable; urgency=medium
+
+  * [8a28236] Remove libvtk6-java. (Closes: #773422)
+  * [dd23d1b] Move TCL-libraries into /usr/lib. 
+              Thanks Ansgar Burchardt for the hint.
+              (Closes: #773424)
+
+ -- Anton Gladky <gladk@debian.org>  Sat, 03 Jan 2015 21:06:27 +0100
+
 vtk6 (6.1.0+dfsg2-4) unstable; urgency=medium
 
   [ Ondřej Surý ]
diff --git a/debian/control b/debian/control
index 1cb9cf4..6227126 100644
--- a/debian/control
+++ b/debian/control
@@ -158,7 +158,6 @@ Depends:
  libtheora-dev,
  libtiff-dev,
  libvtk6.1 (= ${binary:Version}),
- libvtk6-java (= ${binary:Version}),
  libx11-dev,
  libxft-dev,
  libxml2-dev,
@@ -186,25 +185,6 @@ Description: VTK header files for building C++ code
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation.
 
-Package: libvtk6-java
-Architecture: any
-Depends:
- ${java:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests:
- java-virtual-machine,
- libvtk6-dev (= ${binary:Version}),
- vtk6-doc,
- vtk6-examples
-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: python-vtk6
 Architecture: any
 Conflicts: python-vtk
@@ -304,9 +284,5 @@ Description: C++, Tcl and Python example programs/scripts for VTK
  library that allows one to easily write C++ programs, Tcl, Python and
  Java scripts that do 3D visualization.
  .
- This package contains examples from the VTK source. To compile
- the C++ examples you will need to install the vtk-dev package as well.
- Some of them require the libqt4-dev package.
- .
  The Python and Tcl examples can be run with the corresponding packages
- (python-vtk, tcl-vtk).
+ (python-vtk6, tcl-vtk6).
diff --git a/debian/rules b/debian/rules
index 6e54cac..556d05d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,5 @@ override_dh_auto_install:
 	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
-
-override_dh_shlibdeps:
-	dh_shlibdeps -a -l /usr/lib/jvm/default-java/lib
+	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) -name *TCL* -exec mv {} $(CURDIR)/debian/tmp/usr/lib/ \;
+	rename 's/\.so.*/.so/'  $(CURDIR)/debian/tmp/usr/lib/*
diff --git a/debian/tcl-vtk6.install b/debian/tcl-vtk6.install
index decdafd..1ba86ad 100644
--- a/debian/tcl-vtk6.install
+++ b/debian/tcl-vtk6.install
@@ -1,3 +1,5 @@
 usr/bin/vtkWrapTcl-6.1
 usr/bin/vtkWrapTclInit-6.1
 usr/lib/tcltk
+usr/lib/lib*.so.*
+usr/lib/lib*.so