r36668 - in /packages/paraview/trunk/debian: changelog control rules watch

malat-guest at users.alioth.debian.org malat-guest at users.alioth.debian.org
Thu Jul 1 02:18:53 UTC 2010 

Author: malat-guest
Date: Thu Jul  1 02:18:52 2010
New Revision: 36668

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36668
Log:
Fix compilation on armel.

Modified:
    packages/paraview/trunk/debian/changelog
    packages/paraview/trunk/debian/control
    packages/paraview/trunk/debian/rules
    packages/paraview/trunk/debian/watch

Modified: packages/paraview/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/changelog?rev=36668&op=diff
==============================================================================
--- packages/paraview/trunk/debian/changelog (original)
+++ packages/paraview/trunk/debian/changelog Thu Jul  1 02:18:52 2010
@@ -1,3 +1,12 @@
+paraview (3.6.2-5) unstable; urgency=low
+
+  * Building MySQL and PostreSQL for consistency with VTK
+    This will be needed for OverView
+  * Fix watch file to only check release (even number).
+  * Fix compilation on armel. Closes: #587712
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Thu, 01 Jul 2010 04:33:09 +0200
+
 paraview (3.6.2-4) unstable; urgency=low
 
   * Adding myself to maintainers.

Modified: packages/paraview/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/control?rev=36668&op=diff
==============================================================================
--- packages/paraview/trunk/debian/control (original)
+++ packages/paraview/trunk/debian/control Thu Jul  1 02:18:52 2010
@@ -4,8 +4,13 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>,
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), qt4-dev-tools, libboost-all-dev, mpi-default-dev, libhdf5-serial-dev (>= 1.8.4), 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
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2),
+ qt4-dev-tools, libboost-all-dev, mpi-default-dev, libhdf5-serial-dev (>= 1.8.4), 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, libmysqlclient-dev, libpq-dev
 Standards-Version: 3.8.4
+XS-Python-Version: current
 Homepage: http://www.paraview.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/paraview/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/paraview/trunk

Modified: packages/paraview/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/rules?rev=36668&op=diff
==============================================================================
--- packages/paraview/trunk/debian/rules (original)
+++ packages/paraview/trunk/debian/rules Thu Jul  1 02:18:52 2010
@@ -11,6 +11,7 @@
 
 DEB_COMPRESS_EXCLUDE     := .adp .pdf
 PYVER     = $(shell pyversions -dv)
+PYVERS=$(shell pyversions -r debian/control)
 
 # DEB_PYTHON_SYSTEM=pycentral
 
@@ -25,19 +26,28 @@
 #DEB_PYTHON_SETUP_CMD :=
 DEB_DH_MAKESHLIBS_ARGS_paraview := -n
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+	DEB_MAKE_PARALLEL := -j$(NUMJOBS)
+endif
+
+
 DEB_CMAKE_EXTRA_FLAGS=                   \
-	-DBUILD_DOCUMENTATION=ON         \
+        -DBUILD_DOCUMENTATION=ON         \
         -DDOCUMENTATION_HTML_HELP=ON     \
-	-DBUILD_EXAMPLES=OFF              \
+        -DBUILD_EXAMPLES=OFF              \
         -DBUILD_SHARED_LIBS=ON           \
         -DVTK_USE_RPATH=ON               \
         -DCMAKE_VERBOSE_MAKEFILE=OFF     \
         -DCMAKE_BUILD_TYPE="Release"     \
-	-DCMAKE_INSTALL_RPATH=/usr/lib/paraview \
-	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON  \
+        -DCMAKE_INSTALL_RPATH=/usr/lib/paraview \
+        -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON  \
         -DBUILD_TESTING=OFF              \
         -DVTK_USE_MPEG2_ENCODER=OFF       \
         -DVTK_USE_FFMPEG_ENCODER=ON      \
+        -DVTK_USE_MYSQL=ON      \
+        -DVTK_USE_POSTGRES:BOOL=ON \
 	-DFFMPEG_INCLUDE_DIR=/usr/include/ffmpeg \
 	-DPARAVIEW_BUILD_OverView=OFF       \
 	-DPARAVIEW_BUILD_StreamingParaView=OFF \
@@ -91,10 +101,10 @@
         \
         -DHDF5_ENABLE_PARALLEL=ON    	   \
         -DPARAVIEW_ENABLE_PYTHON=ON        \
-        -DMPI_LIBRARY="/usr/lib/libmpi.so" \
-		-DMPI_EXTRA_LIBRARY="/usr/lib/libmpi++.so" \
         -DMPI_INCLUDE_PATH=/usr/include/mpi \
         -DPYTHON_EXECUTABLE=/usr/bin/python$(PVER) \
+	      -DPYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) \
+	      -DPYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so \
         -DPV_INSTALL_LIB_DIR="$${PV_INSTALL_ROOT}/lib/paraview" \
         -DPV_INSTALL_INCLUDE_DIR="$${PV_INSTALL_ROOT}/include/paraview"
 
@@ -177,7 +187,6 @@
 	-find $(CURDIR) -name "*.pyc" | xargs rm -f
 	-find $(CURDIR) -name "Makefile.orig" | xargs rm -f
 
-
 get-orig-source:
 	uscan --force-download
 

Modified: packages/paraview/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/watch?rev=36668&op=diff
==============================================================================
--- packages/paraview/trunk/debian/watch (original)
+++ packages/paraview/trunk/debian/watch Thu Jul  1 02:18:52 2010
@@ -1,4 +1,4 @@
 version=3
 # do not consider release candidates (RC), as it makes the script report bogus result
 #http://paraview.org/files/v([\d\.]+)/[pP]ara[vV]iew-([\d\.RC-]+)\.tar\.gz
-http://paraview.org/files/v([\d\.]+)/[pP]ara[vV]iew-([\d\.]+)\.tar\.gz
+http://paraview.org/files/v([\d]+.[02468]+)/[pP]ara[vV]iew-([\d\.]+)\.tar\.gz

More information about the debian-science-commits mailing list