Package: paraview
Version: 3.4.0-4
Severity: normal
See attached file.
--
Francesco P. Lovergine
diff --git a/debian/changelog b/debian/changelog
index bce94e3..0a1a6cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+paraview (3.4.0-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ Incidentally, now it builds with current HDF5 libraries (Closes: #546068).
+ * Added patches:
+ add_missing_string_includes.patch
+ fix_H5FD_class_t_usage.patch
+ to fix FTBS. Thanks Peter Green (Closes: #542341).
+ * Fixed watch file to catch the latest version.
+
+ -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 09 Oct 2009 23:04:05 +0200
+
paraview (3.4.0-4) unstable; urgency=low
[ Rafael Laboissiere ]
diff --git a/debian/patches/add_missing_string_includes.patch b/debian/patches/add_missing_string_includes.patch
new file mode 100644
index 0000000..84b96b5
--- /dev/null
+++ b/debian/patches/add_missing_string_includes.patch
@@ -0,0 +1,35 @@
+diff -ur paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfArray.h paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfArray.h
+--- paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-08-29 16:08:58.000000000 +0100
++++ paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfArray.h 2009-08-31 01:17:54.000000000 +0100
+@@ -26,6 +26,7 @@
+ #define __XdmfArray_h
+
+ #include "XdmfDataDesc.h"
++#include <string.h>
+
+ #define XDMF_LONGEST_LENGTH (XdmfInt64)~0
+ #define XDMF_ARRAY_TAG_LENGTH 80
+diff -ur paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.h
+--- paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-02-21 16:55:28.000000000 +0000
++++ paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2009-08-31 01:24:46.000000000 +0100
+@@ -27,6 +27,7 @@
+
+ #include "XdmfObject.h"
+ #include "XdmfHDFSupport.h"
++#include <string.h>
+
+ #define XDMF_SELECTALL 0
+ #define XDMF_HYPERSLAB 1
+diff -ur paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx
+--- paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-09 19:43:47.000000000 +0100
++++ paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-08-31 02:37:57.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include "hdf5.h"
+
+ #include <stdlib.h>
++#include <string.h>
+
+ #define HDF_IO_DEBUG 1
+ #undef HDF_IO_DEBUG
+
+
diff --git a/debian/patches/fix_H5FD_class_t_usage.patch b/debian/patches/fix_H5FD_class_t_usage.patch
new file mode 100644
index 0000000..e0a443b
--- /dev/null
+++ b/debian/patches/fix_H5FD_class_t_usage.patch
@@ -0,0 +1,58 @@
+diff -ur paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx
+--- paraview-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-09 19:43:47.000000000 +0100
++++ paraview-3.4.0.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-08-31 02:37:57.000000000 +0100
+@@ -132,9 +133,9 @@
+ static herr_t H5FD_dsm_flush(H5FD_t *_file);
+ #endif
+ static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+-static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
+-static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
+-static haddr_t H5FD_dsm_get_eof(H5FD_t *_file);
++static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
++static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
++static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
+ static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
+ DSM_HSIZE_T size, void *buf);
+ static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
+@@ -159,6 +160,7 @@
+ H5FD_dsm_close, /*close */
+ H5FD_dsm_cmp, /*cmp */
+ NULL, /*query */
++ NULL, /*get_type_map */
+ NULL, /*alloc */
+ NULL, /*free */
+ H5FD_dsm_get_eoa, /*get_eoa */
+@@ -168,6 +170,7 @@
+ H5FD_dsm_read, /*read */
+ H5FD_dsm_write, /*write */
+ NULL, /*flush */
++ NULL, /*truncate */
+ NULL, /*lock */
+ NULL, /*unlock */
+ H5FD_FLMAP_SINGLE /*fl_map */
+@@ -594,7 +597,7 @@
+ *-------------------------------------------------------------------------
+ */
+ static haddr_t
+-H5FD_dsm_get_eoa(H5FD_t *_file)
++H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
+ {
+ H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
+
+@@ -622,7 +625,7 @@
+ *-------------------------------------------------------------------------
+ */
+ static herr_t
+-H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)
++H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
+ {
+ H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
+
+@@ -663,7 +666,7 @@
+ *-------------------------------------------------------------------------
+ */
+ static haddr_t
+-H5FD_dsm_get_eof(H5FD_t *_file)
++H5FD_dsm_get_eof(const H5FD_t *_file)
+ {
+ H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
diff --git a/debian/patches/qt.patch b/debian/patches/qt.patch
new file mode 100644
index 0000000..4a413e0
--- /dev/null
+++ b/debian/patches/qt.patch
@@ -0,0 +1,21 @@
+Index: paraview-3.4.0/CMakeLists.txt
+===================================================================
+--- CMakeLists.txt 2009/04/27 13:01:33 1.96
++++ CMakeLists.txt 2009/04/30 16:44:47 1.97
+@@ -98,12 +98,12 @@
+ # don't go greater than supported version
+ STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}")
+ IF (NOT qt_version_tmp)
+- STRING(REGEX MATCH "^4\\.4\\.[0-9]+" qt_version4_4_tmp "${QTVERSION}")
+- IF (NOT qt_version4_4_tmp)
++ STRING(REGEX MATCH "^4\\.[0-9]+\\.[0-9]+" qt_version4_x_tmp "${QTVERSION}")
++ IF (NOT qt_version4_x_tmp)
+ MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).")
+- ELSE (NOT qt_version4_4_tmp)
++ ELSE (NOT qt_version4_x_tmp)
+ MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3")
+- ENDIF (NOT qt_version4_4_tmp)
++ ENDIF (NOT qt_version4_x_tmp)
+ ENDIF (NOT qt_version_tmp)
+ # enforce Carbon in VTK for Qt/Mac
+ IF(Q_WS_MAC)
diff --git a/debian/patches/series b/debian/patches/series
index 74f1301..2b5ba10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ assistant-qt4.patch
search-client-doc-finder-in-fhs-dir.patch
use-ffmpeg-swscaler.patch
qt.patch
+add_missing_string_includes.patch
+fix_H5FD_class_t_usage.patch
diff --git a/debian/watch b/debian/watch
index 5d0e3be..70eb81d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://www.paraview.org/files/v3.4/paraview-([\d.]+).tar.gz
+http://paraview.org/paraview/resources/software.html .*paraview-([\d.]+)\.tar\.gz
