[vtk6] 02/02: Fis in installation pathes.

[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 1444a5131d342a4e9c1f930c4f84d9db76ab6620
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Oct 12 00:07:39 2013 +0200

    Fis in installation pathes.
---
 debian/control              |    2 ++
 debian/libvtk6-dev.install  |    2 +-
 debian/libvtk6-java.install |    2 +-
 debian/libvtk6.install      |    2 +-
 debian/rules                |    4 ++++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f827a5a..a394655 100644
--- a/debian/control
+++ b/debian/control
@@ -23,9 +23,11 @@ Build-Depends:
  libmysqlclient-dev,
  libnetcdf-dev,
  libosmesa6-dev,
+ libogg-dev,
  libpng-dev,
  libpq-dev,
  libqt4-dev,
+ libqtwebkit-dev,
  libsqlite3-dev,
  libswscale-dev,
  libtiff-dev,
diff --git a/debian/libvtk6-dev.install b/debian/libvtk6-dev.install
index 911454e..4dc846e 100644
--- a/debian/libvtk6-dev.install
+++ b/debian/libvtk6-dev.install
@@ -1,5 +1,5 @@
 usr/bin/vtkEncodeString-6.0
 usr/bin/vtkWrapHierarchy-6.0
 usr/include/vtk-6.0                    usr/include
-usr/lib/*.so
+usr/lib/*/*.so
 usr/lib/cmake/vtk-6.0
diff --git a/debian/libvtk6-java.install b/debian/libvtk6-java.install
index 0572fbf..1d4eba9 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/*/vtk.jar                           usr/share/java
diff --git a/debian/libvtk6.install b/debian/libvtk6.install
index 093956b..3de3b10 100644
--- a/debian/libvtk6.install
+++ b/debian/libvtk6.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/rules b/debian/rules
index a6c6b9b..93d539a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ extra_flags +=  \
 	-DVTK_Group_Views=ON \
 	-DVTK_BUILD_ALL_MODULES=ON \
 	-DMPI_CXX_INCLUDE_PATH="/usr/include/mpi" \
+	-DVTK_INSTALL_LIBRARY_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)
@@ -38,3 +39,6 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf $(BUILDDIR)
 
+override_dh_link:
+	cd $(CURDIR)/debian ; rm -f python-vtk6.links ; ./generate_links.sh $(DEB_HOST_MULTIARCH)
+	dh_link

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