Merge lp:~kamalmostafa/ubuntu/lucid/paraview/fix-522386-ftbfs into lp:ubuntu/lucid/paraview

[Kamal Mostafa]

[Fabrice Coutadeur (fabricesp)]

Hi,

Please add the change to Utilities/Xdmf2/libsrc/XdmfObject.h as a patch.

Thnaks,
Fabrice

review: Needs Fixing

[Kamal Mostafa (kamalmostafa)]

Oops! Thanks Fabrice -- new version on the way.

review: Disapprove

Unmerged revisions

11. By Kamal Mostafa on 2010-02-15

* Fix two problems which cause paraview FTBFS in Ubuntu Lucid: (LP: #522386)
  - Utilities/Xdmf2/libsrc/XdmfObject.h: add required #include <string.h>.
  - debian/rules, control: build with PARAVIEW_USE_SYSTEM_HDF5=OFF to use
    internal hdf5 library, as paraview requires an earlier version of
    libhdf5-serial-dev than Ubuntu Lucid's 1.8.3-2.1.

=== modified file 'Utilities/Xdmf2/libsrc/XdmfObject.h'
--- Utilities/Xdmf2/libsrc/XdmfObject.h	2008-10-17 17:47:41 +0000
+++ Utilities/Xdmf2/libsrc/XdmfObject.h	2010-02-19 23:45:27 +0000
@@ -69,6 +69,7 @@
 #ifndef __XdmfObject_h
 #define __XdmfObject_h
 
+#include <string.h> // strcmp, strlen, strcpy
 
 # ifndef SWIG
 #if !defined( WIN32 ) || defined(__CYGWIN__)

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-19 21:33:49 +0000
+++ debian/changelog	2010-02-19 23:45:27 +0000
@@ -1,3 +1,13 @@
+paraview (3.4.0-4ubuntu6) lucid; urgency=low
+
+  * Fix two problems which cause paraview FTBFS in Ubuntu Lucid: (LP: #522386)
+    - Utilities/Xdmf2/libsrc/XdmfObject.h: add required #include <string.h>.
+    - debian/rules, control: build with PARAVIEW_USE_SYSTEM_HDF5=OFF to use
+      internal hdf5 library, as paraview requires an earlier version of
+      libhdf5-serial-dev than Ubuntu Lucid's 1.8.3-2.1.
+
+ -- Kamal Mostafa <[e-mail]>  Mon, 15 Feb 2010 13:39:50 -0800
+
 paraview (3.4.0-4ubuntu5) lucid; urgency=low
 
   * rebuild for ffmpeg versioned symbols

=== modified file 'debian/control'
--- debian/control	2009-05-24 23:41:22 +0000
+++ debian/control	2010-02-19 23:45:27 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Scientific Computing Team <[e-mail]>
 Uploaders: Christophe Prud'homme <[e-mail]>, Ondrej Certik <[e-mail]>
-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
+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, libavformat-dev (>= 0.svn20080206), libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, chrpath, libglu1-mesa-dev, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot
 Standards-Version: 3.8.1
 XS-DM-Upload-Allowed: yes
 Homepage: http://www.paraview.org/

=== modified file 'debian/rules'
--- debian/rules	2009-06-10 12:26:28 +0000
+++ debian/rules	2010-02-19 23:45:27 +0000
@@ -32,7 +32,7 @@
         -DVTK_USE_FFMPEG_ENCODER=ON      \
 	-DFFMPEG_INCLUDE_DIR=/usr/include/ffmpeg \
         -DPARAVIEW_USE_MPI=ON              \
-        -DPARAVIEW_USE_SYSTEM_HDF5=ON      \
+        -DPARAVIEW_USE_SYSTEM_HDF5=OFF      \
         -DHDF5_ENABLE_PARALLEL=ON    	   \
         -DPARAVIEW_ENABLE_PYTHON=ON        \
         -DCMAKE_VERBOSE_MAKEFILE=OFF       \