[SCM] Test git-repository for paraview branch, master, updated. upstream/3.10.1-36-g5c7c089

[Anton Gladky]

The following commit has been merged in the master branch:
commit 5c7c089eff5ecd32b37d5fe1738d804fbf4ce84b
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Jul 25 19:52:07 2011 +0200

    Fix installing python-modules

diff --git a/debian/control b/debian/control
index b799485..2952a0d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,13 +11,13 @@ Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-4), cmake (>= 2.6.3),
  qt4-dev-tools, libboost-all-dev, 
  libavformat-dev (>= 0.svn20080206),
  libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, python-support, 
- chrpath, libglu1-mesa-dev, libxt-dev,
+ chrpath, libglu1-mesa-dev, libxt-dev, python-all, python-all-dev,
  libxext-dev, doxygen, graphviz, gnuplot, libtiff-dev, libpng-dev, libjpeg-dev, 
  libxml2-dev, libexpat-dev,
  zlib1g-dev, libfreetype6-dev, libmysqlclient-dev, libpq-dev, libtheora-dev, 
  libogg-dev, mpi-default-dev, libhdf5-serial-dev
 Standards-Version: 3.9.2
-XS-Python-Version: current
+X-Python-Version: >=2.6
 Homepage: http://www.paraview.org/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/paraview.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/paraview.git
diff --git a/debian/paraview.install b/debian/paraview.install
index 2d0c696..0f665b6 100644
--- a/debian/paraview.install
+++ b/debian/paraview.install
@@ -1,5 +1,7 @@
+debian/*.xpm usr/share/pixmaps/
+debian/*.desktop usr/share/applications/
 usr/bin usr
 usr/lib usr
 usr/lib/paraview/vistrails/plugin/pgui/resources/images/* usr/share/doc/paraview/images/vistrails/pgui/images
 usr/lib/paraview/vistrails/plugin/app/resources/images/app_icon.png usr/share/doc/paraview/images/vistrails/app/images
-usr/lib/paraview/CMake/branded_splash.png usr/share/docs/paraview/images/CMake/
+usr/lib/paraview/CMake/branded_splash.png usr/share/doc/paraview/images/CMake/
diff --git a/debian/paraview.pyinstall b/debian/paraview.pyinstall
new file mode 100644
index 0000000..c59b50a
--- /dev/null
+++ b/debian/paraview.pyinstall
@@ -0,0 +1,3 @@
+debian/build/Utilities/VTKPythonWrapping/site-packages/paraview/*.py paraview
+debian/build/Utilities/VTKPythonWrapping/site-packages/paraview/demos/*.py paraview.demos
+debian/build/Utilities/VTKPythonWrapping/site-packages/paraview/vtk/*.py paraview.vtk
diff --git a/debian/rules b/debian/rules
index 16e0bb4..b2a5048 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@ BUILDDIR = $(CURDIR)/debian/build
 DESTDIR = $(CURDIR)/debian/tmp
 
 %:
-	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with=python2
 
 export LD_LIBRARY_PATH+=:$(CURDIR)/debian/paraview/usr/lib/paraview
 
@@ -44,7 +44,6 @@ extra_flags += 	-DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
 	-DHDF5_ENABLE_PARALLEL=ON \
 	-DMPI_LINK_FLAGS=-Wl \
 	-DPARAVIEW_ENABLE_PYTHON=ON \
-	-DPYTHON_EXECUTABLE=/usr/bin/python$(PVER) \
 	-DVTK_USE_OGGTHEORA_ENCODER=ON \
 	-DVTK_USE_SYSTEM_OGGTHEORA=ON \
 	-DCMAKE_C_FLAGS='$(CFLAGS)' \
@@ -66,19 +65,6 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(DESTDIR)
 	chmod a+x $(DESTDIR)/usr/lib/paraview/testing/FindString.tcl
-	if [ "$(PYVER)" = "2.6" ]; \
-	then \
-		dh_install -pparaview -XCMake -Xcmake -XMakefile \
-			--sourcedir=$(BUILDDIR) \
-			Utilities/VTKPythonWrapping/site-packages/paraview/ \
-			usr/lib/python$(PYVER)/dist-packages; \
-	else \
-		dh_install -pparaview -XCMake -Xcmake -XMakefile \
-			--sourcedir=$(BUILDDIR) \
-			Utilities/VTKPythonWrapping/site-packages/paraview/ \
-			usr/lib/python$(PYVER)/site-packages; \
-	fi
-	dh_python2 -pparaview
-	dh_install -pparaview --sourcedir=$(CURDIR)/debian paraview.xpm usr/share/pixmaps
-	dh_install -pparaview --sourcedir=$(CURDIR)/debian paraview.xml usr/share/mime/packages
-	dh_install -pparaview --sourcedir=$(CURDIR)/debian paraview.desktop usr/share/applications
+
+override_dh_makeshlibs:
+

-- 
Test git-repository for paraview