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

[Christophe Prud'homme]

SVN commit 2659 by prudhomm:

fixed help


 M  +5 -1      paraview/trunk/debian/changelog  
 M  +1 -1      paraview/trunk/debian/control  
 M  +4 -4      paraview/trunk/debian/patches/assistant-qt4.patch  
 M  +3 -3      paraview/trunk/debian/patches/ffmpeg_writer.patch  
 M  +4 -0      paraview/trunk/debian/rules  


--- paraview/trunk/debian/changelog #2658:2659
@@ -1,9 +1,13 @@
 paraview (3.2.3-2) unstable; urgency=low
 
   [Christophe Prud'homme]    
+  * debian/rules: enable hdf5 with parallel support
+  * debian/rules: enable documentation and examples
   * debian/control: added libxext-dev to fix QT_X11_Xext_LIBRARY not set properly
+  * Bug fix: "paraview: Help->Help doesn't work", thanks to Thomas
+    Weber (Closes: #488671).
 
- -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 01 Aug 2008 18:05:28 +0200
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 01 Aug 2008 23:39:13 +0200
 
 paraview (3.2.3-1) unstable; urgency=low
 
--- paraview/trunk/debian/control #2658:2659
@@ -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 (>= 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, libxt-dev, libxext-dev
+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, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot
 Standards-Version: 3.8.0
 XS-DM-Upload-Allowed: yes
 Homepage: http://www.paraview.org/
--- paraview/trunk/debian/patches/assistant-qt4.patch #2658:2659
@@ -1,13 +1,13 @@
-Index: paraview-3.2.2/Applications/Client/MainWindow.cxx
+Index: paraview-3.2.3/Applications/Client/MainWindow.cxx
 ===================================================================
---- paraview-3.2.2.orig/Applications/Client/MainWindow.cxx	2008-06-04 23:40:01.000000000 +0200
-+++ paraview-3.2.2/Applications/Client/MainWindow.cxx	2008-06-15 12:31:20.126183983 +0200
+--- paraview-3.2.3.orig/Applications/Client/MainWindow.cxx	2007-11-06 20:10:33.000000000 +0100
++++ paraview-3.2.3/Applications/Client/MainWindow.cxx	2008-08-01 21:34:33.000000000 +0200
 @@ -896,7 +896,7 @@
    QString assistantExe;
    QString profileFile;
  
 -  const char* assistantName = "assistant";
-+  const char* assistantName = "assistant-qt4";
++  const char* assistantName = "assistant_adp";
  #if defined(Q_WS_WIN)
    const char* binDir = "\\";
    const char* binDir1 = "\\..\\";
--- paraview/trunk/debian/patches/ffmpeg_writer.patch #2658:2659
@@ -1,7 +1,7 @@
-Index: paraview-3.2.2/VTK/IO/vtkFFMPEGWriter.cxx
+Index: paraview-3.2.3/VTK/IO/vtkFFMPEGWriter.cxx
 ===================================================================
---- paraview-3.2.2.orig/VTK/IO/vtkFFMPEGWriter.cxx	2008-07-29 08:47:55.000000000 +0200
-+++ paraview-3.2.2/VTK/IO/vtkFFMPEGWriter.cxx	2008-07-29 08:48:51.000000000 +0200
+--- paraview-3.2.3.orig/VTK/IO/vtkFFMPEGWriter.cxx	2008-08-01 18:12:56.000000000 +0200
++++ paraview-3.2.3/VTK/IO/vtkFFMPEGWriter.cxx	2008-08-01 18:12:57.000000000 +0200
 @@ -158,6 +158,10 @@
        c->bit_rate = 12*1024*1024;
        break;
--- paraview/trunk/debian/rules #2658:2659
@@ -19,6 +19,9 @@
 PVER = 2.5
 
 DEB_CMAKE_EXTRA_FLAGS=                   \
+	-DBUILD_DOCUMENTATION=ON         \
+        -DDOCUMENTATION_HTML_HELP=ON     \
+	-DBUILD_EXAMPLES=ON              \
         -DBUILD_SHARED_LIBS=ON           \
         -DVTK_USE_RPATH=ON               \
 	-DCMAKE_INSTALL_RPATH=/usr/lib/paraview \
@@ -28,6 +31,7 @@
         -DVTK_USE_FFMPEG_ENCODER=ON      \
 	-DFFMPEG_INCLUDE_DIR=/usr/include/ffmpeg \
         -DPARAVIEW_USE_MPI=ON            \
+        -DHDF5_ENABLE_PARALLEL           \
         -DPARAVIEW_ENABLE_PYTHON=ON      \
         -DCMAKE_VERBOSE_MAKEFILE=OFF      \
         -DCMAKE_C_FLAGS="-O2 -fPIC"      \