[Pkg-scicomp-commits] paraview/trunk/debian

[Christophe Prud'homme]

SVN commit 4746 by prudhomm:

fix python support


 M  +1 -1      paraview/trunk/debian/control  
 M  +17 -17    paraview/trunk/debian/rules  


--- paraview/trunk/debian/control #4745:4746
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Ondrej Certik <ondrej at certik.cz>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), autotools-dev, quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), qt4-dev-tools, mpi-default-dev, libhdf5-serial-dev, libavformat-dev (>= 0.svn20080206), libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, chrpath, libglu1-mesa-dev, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot, libtiff4-dev, libpng12-dev,libjpeg62-dev,libxml2-dev,libexpat1-dev,zlib1g-dev,libfreetype6-dev
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), autotools-dev, quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), qt4-dev-tools, mpi-default-dev, libhdf5-serial-dev, libavformat-dev (>= 0.svn20080206), libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, python-support, chrpath, libglu1-mesa-dev, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot, libtiff4-dev, libpng12-dev,libjpeg62-dev,libxml2-dev,libexpat1-dev,zlib1g-dev,libfreetype6-dev
 Standards-Version: 3.8.3
 XS-DM-Upload-Allowed: yes
 Homepage: http://www.paraview.org/
--- paraview/trunk/debian/rules #4745:4746
@@ -10,6 +10,7 @@
 #export DH_VERBOSE=1
 
 DEB_COMPRESS_EXCLUDE     := .adp .pdf
+PYVER     = $(shell pyversions -dv)
 
 # DEB_PYTHON_SYSTEM=pycentral
 
@@ -23,8 +24,6 @@
 #DEB_PYTHON_SETUP_CMD := $(DEB_BUILDDIR)/VTK/Wrapping/Python/setup.py
 #DEB_PYTHON_SETUP_CMD :=
 
-PVER = 2.5
-
 DEB_CMAKE_EXTRA_FLAGS=                   \
 	-DBUILD_DOCUMENTATION=ON         \
         -DDOCUMENTATION_HTML_HELP=ON     \
@@ -145,23 +144,24 @@
 	-rm -rf debian/paraview/include
 	-rm -rf debian/paraview/scratch
 
-	-for i in `find debian/paraview/usr/lib/paraview/ -name "*.so*"`; \
-          do \
-            chrpath -r/usr/lib/paraview:/usr/lib/python$(PVER)/config $$i; \
-          done
-	-for i in `find debian/paraview/usr/bin/ -name "*"`; \
-          do \
-            chrpath -r/usr/lib/paraview:/usr/lib/python$(PVER)/config $$i; \
-          done
-	-mkdir -p debian/paraview/usr/lib/python$(PVER)/site-packages/
-	-cp -r $(DEB_BUILDDIR)/Utilities/VTKPythonWrapping/paraview debian/paraview/usr/lib/python$(PVER)/site-packages/
-	-rm debian/paraview/usr/lib/python$(PVER)/site-packages/paraview/*.pyc
-	-for i in debian/paraview/usr/lib/paraview/lib*Python*so; do \
-          name=`basename $$i`; \
-          ln -sf /usr/lib/paraview/$$name debian/paraview/usr/lib/python$(PVER)/site-packages/paraview/; \
-        done
+	if [ "$(PYVER)" = "2.6" ]; \
+	then \
+	  dh_install -pparaview -XCMake -Xcmake -XMakefile \
+	    $(DEB_BUILDDIR)/Utilities/VTKPythonWrapping/paraview/ \
+	    usr/lib/python$(PYVER)/dist-packages; \
+	else \
+	  dh_install -pparaview -XCMake -Xcmake -XMakefile \
+	    $(DEB_BUILDDIR)/Utilities/VTKPythonWrapping/paraview/ \
+	    usr/lib/python$(PYVER)/site-packages; \
+	fi
+	dh_pysupport -pparaview
 	-rm -r debian/paraview/usr/lib/paraview/doc
 
+clean::
+	-find $(CURDIR) -name "*.pyc" | xargs rm -f
+	-find $(CURDIR) -name "Makefile.orig" | xargs rm -f
+
+
 get-orig-source:
 	uscan --force-download