[vtk6] 02/02: Use /usr/bin/vtk instead /usr/bin/vtk6

[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 1dbe2cf3ac79c743393a8c1b9c38a99aad60b7d3
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Mar 1 18:19:51 2014 +0100

    Use /usr/bin/vtk instead /usr/bin/vtk6
    
    Declare conflict between tcl-vtk and tcl-vtk6
---
 debian/control | 4 ++++
 debian/rules   | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6d4368e..4f8cbbf 100644
--- a/debian/control
+++ b/debian/control
@@ -210,6 +210,10 @@ Description: Python bindings for VTK
  information may be available in /usr/share/doc/python-vtk/.
 
 Package: tcl-vtk6
+Conflicts:
+ tcl-vtk
+Replaces:
+ tcl-vtk
 Architecture: any
 Depends:
  libvtk6 (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 2d25f95..d1b207c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,6 @@ override_dh_auto_install:
 	perl -pi -e "s|{dir}/JavaDependencies.cmake.in\"|{VTK_DIR}/JavaDependencies.cmake.in\"|" debian/tmp/usr/lib/cmake/vtk-6.0/vtkWrapJava.cmake
 	# 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
 	mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk6python
 	

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