[SCM] Paraview packaging branch, master, updated. upstream/3.12.0-138-gc59221e

[Anton Gladky]

The following commit has been merged in the master branch:
commit 59afb75028bce40e8f1b74c8fddcb95dc4c5ded2
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Jan 27 21:12:07 2012 +0100

    Remove files from paraview-python, which are conflicting with python-vtk.

diff --git a/debian/control b/debian/control
index 9a830c0..4e3cd69 100644
--- a/debian/control
+++ b/debian/control
@@ -93,9 +93,8 @@ Package: paraview-python
 Architecture: any
 Section: python
 Depends: paraview (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, 
- ${shlibs:Depends}, python (>= 2.7), python (<<2.8),
+ ${shlibs:Depends}, python (>= 2.7), python (<<2.8), python-vtk
 Provides: ${python:Provides}
-Conflicts: python-vtk
 Description: Parallel Visualization Application. python-support
  ParaView is an open-source, multi-platform application designed to
  visualize data sets of size varying from small to very large. The
diff --git a/debian/paraview-python.install b/debian/paraview-python.install
index 043b40c..7e3ed3f 100644
--- a/debian/paraview-python.install
+++ b/debian/paraview-python.install
@@ -1,4 +1 @@
 usr/bin/pvpython
-# dup python-vtk:
-usr/bin/vtkWrapPython
-usr/bin/vtkWrapPythonInit

-- 
Paraview packaging