[paraview] 01/03: Rebuild against vtk6.git

[Christophe Trophime]

This is an automated email from the git hooks/post-receive script.

trophime-guest pushed a commit to branch use_external_vtk
in repository paraview.

commit 9780829c575e11dea24ec91890c9ac1b29f8b414
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Mon Nov 4 12:59:12 2013 +0100

    Rebuild against vtk6.git
---
 debian/control |    4 ++--
 debian/rules   |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index ebfac82..bd583f7 100644
--- a/debian/control
+++ b/debian/control
@@ -11,11 +11,11 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.3), gfortran,
  python-matplotlib, python-sphinx,
  default-jdk, javahelper,
  tcl8.6-dev,
- libvtk6-dev, tcl-vtk, python-vtk, libvtk-java, libvtk6-qt4-dev,
+ libvtk6-dev, vtk6, tcl-vtk6, python-vtk6, libvtk6-java,
  zlib1g-dev, libfreetype6-dev,
  libhdf5-mpi-dev (>= 1.8.8), hdf5-tools,
  libeigen3-dev, libboost-all-dev,
- libqt4-dev (>= 4.3.3-2), libqt4-opengl-dev (>= 4.3.3-2), libsqlite3-dev, qt4-dev-tools, libqtwebkit-dev (>=2.2.1),
+ libqt4-dev (>= 4.3.3-2), libqt4-opengl-dev (>= 4.3.3-2), libsqlite3-dev, qt4-dev-tools, libqtwebkit-dev (>=2.2.1), qt4-dev-tools,
  freeglut3-dev, libxmu-dev, libxi-dev,
  xvfb, xauth,
  libjsoncpp-dev,
diff --git a/debian/rules b/debian/rules
index 1b14f6e..b22e3b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,12 +75,11 @@ override_dh_auto_clean:
 	rm -rf $(CURDIR)/Build
 	rm -rf $(CURDIR)/debian/tmp
 	#if [ -d VTK.old ]; then mv VTK.old VTK; fi
-	#if [ -d pv-src-tmp/VTK.old ]; then mv pv-src-tmp/VTK.old pv-src-tmp/VTK; fi
+	if [ -d Wrapping/Java ]; then rm -rf Wrapping/Java; fi
 	jh_build --clean
 
 override_dh_auto_configure:
 	#mv VTK VTK.old
-	#mv pv-src-tmp/VTK pv-src-tmp/VTK.old
 	
 	mkdir -p $(CURDIR)/Build/java
 	

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