[vtk6] 01/03: Add conflict of vtk6 with tcl-vtk.

[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 00730af884365dfc68e900f06de092b5682f4a7b
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Mar 12 21:20:42 2014 +0100

    Add conflict of vtk6 with tcl-vtk.
---
 debian/control      | 7 +++----
 debian/vtk6.install | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 4f8cbbf..25f20f2 100644
--- a/debian/control
+++ b/debian/control
@@ -128,6 +128,7 @@ Depends:
  libc6-dev,
  libexpat-dev,
  libfreetype6-dev,
+ libgdal-dev,
  libgl1-mesa-dev | libgl-dev,
  libgl2ps-dev,
  libglu1-mesa-dev | libglu-dev,
@@ -210,10 +211,6 @@ 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}),
@@ -241,6 +238,8 @@ Depends:
 Suggests:
  vtk6-doc,
  vtk6-examples
+Conflicts:
+ tcl-vtk
 Section: interpreters
 Description: Binaries for VTK6
  The Visualization Toolkit (VTK) is an object oriented, high level
diff --git a/debian/vtk6.install b/debian/vtk6.install
index 7068f95..62c9a66 100644
--- a/debian/vtk6.install
+++ b/debian/vtk6.install
@@ -1,4 +1,4 @@
-usr/bin/vtk6
+usr/bin/vtk
 usr/bin/vtkEncodeString-6.0
 usr/bin/vtkHashSource-6.0
 usr/bin/vtkParseOGLExt-6.0

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