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

[Ondrej Certik]

SVN commit 2499 by certik-guest:

python versions fixed

 M  +2 -0      paraview/trunk/debian/changelog  
 M  +1 -1      paraview/trunk/debian/control  
 M  +11 -9     paraview/trunk/debian/rules  


--- paraview/trunk/debian/changelog #2498:2499
@@ -13,6 +13,8 @@
   * cmake2.6.patch added to configure well with cmake2.6
   * libglu1-mesa-dev added to Build-Depends
   * gcc4.3.patch added with fixes to compile with gcc 4.3
+  * Standards-Version bumped to 3.8.0 (no action needed)
+  * debian/rules: python 2.4 changed to 2.5
 
   [Christophe Prud'homme]
   * added paraview manapage by Gerber van der Graaf
--- paraview/trunk/debian/control #2498:2499
@@ -4,7 +4,7 @@
 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 (>= 5), autotools-dev, quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), libopenmpi-dev, ffmpeg, libavformat-dev, libavutil-dev, libavcodec-dev, python-dev, chrpath, libglu1-mesa-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 XS-DM-Upload-Allowed: yes
 Homepage: http://www.paraview.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/paraview/trunk
--- paraview/trunk/debian/rules #2498:2499
@@ -16,6 +16,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+PVER = 2.5
+
 DEB_CMAKE_EXTRA_FLAGS=                   \
         -DBUILD_SHARED_LIBS=ON           \
         -DVTK_USE_RPATH=ON               \
@@ -31,7 +33,7 @@
         -DCMAKE_CXX_FLAGS="-O2 -fPIC"    \
         -DMPI_LIBRARY="/usr/lib/libmpi.so" \
         -DMPI_INCLUDE_PATH=/usr/include/mpi \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2.4 \
+        -DPYTHON_EXECUTABLE=/usr/bin/python$(PVER) \
         -DPV_INSTALL_LIB_DIR="$${PV_INSTALL_ROOT}/lib/paraview" \
         -DPV_INSTALL_INCLUDE_DIR="$${PV_INSTALL_ROOT}/include/paraview"
 
@@ -57,18 +59,18 @@
 	-mv debian/paraview/usr/plugins debian/paraview/usr/lib/paraview
 	-for i in `find debian/paraview/usr/lib/paraview/ -name "*.so*"`; \
          do \
-           chrpath -r/usr/lib/paraview:/usr/lib/python2.4/config $$i; \
+           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/python2.4/config $$i; \
+           chrpath -r/usr/lib/paraview:/usr/lib/python$(PVER)/config $$i; \
          done
-	-mkdir -p debian/paraview/usr/lib/python2.4/site-packages/
-	-cp -r $(DEB_BUILDDIR)/Utilities/VTKPythonWrapping/paraview debian/paraview/usr/lib/python2.4/site-packages/
-	-rm debian/paraview/usr/lib/python2.4/site-packages/paraview/*.pyc
-	-ln -s /usr/lib/paraview/libvtkPVServerCommonPython.so debian/paraview/usr/lib/python2.4/site-packages/paraview/
-	-ln -s /usr/lib/paraview/libvtkCommonPython.so debian/paraview/usr/lib/python2.4/site-packages/paraview/
-	-ln -s /usr/lib/paraview/libvtkPVServerManagerPython.so debian/paraview/usr/lib/python2.4/site-packages/paraview/
+	-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
+	-ln -s /usr/lib/paraview/libvtkPVServerCommonPython.so debian/paraview/usr/lib/python$(PVER)/site-packages/paraview/
+	-ln -s /usr/lib/paraview/libvtkCommonPython.so debian/paraview/usr/lib/python$(PVER)/site-packages/paraview/
+	-ln -s /usr/lib/paraview/libvtkPVServerManagerPython.so debian/paraview/usr/lib/python$(PVER)/site-packages/paraview/
 	-rm -r debian/paraview/usr/lib/paraview/doc
 	-# install the documentation
 	-mkdir debian/paraview/usr/share/paraview