[SCM] Paraview packaging branch, master, updated. debian/3.14.1-1-6-g532f88c

[Anton Gladky]

The following commit has been merged in the master branch:
commit d04f9a0e7417545d901e20b83c4716487d74a978
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon May 7 19:10:41 2012 +0200

    Fix FTBFS againct boost 1.49.

diff --git a/debian/patches/fix_FTBFS_boost149.patch b/debian/patches/fix_FTBFS_boost149.patch
new file mode 100644
index 0000000..b04d391
--- /dev/null
+++ b/debian/patches/fix_FTBFS_boost149.patch
@@ -0,0 +1,27 @@
+Description: fix FTBFS with boost 1.49
+Author: Dominique Belhachemi <domibel at debian.org>
+Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=55084a11b450e53b2e8786e23dd64a6a6b846e6b
+Last-Update: 2012-05-07
+
+--- a/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
++++ b/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+@@ -49,11 +49,17 @@
+ 
+ #if BOOST_VERSION >= 104800      // Boost 1.48.x
+ namespace {
+-  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
++  vtkIdType unwrap_edge_id(vtkEdgeType const &e) 
++  {
+     return e.Id;
+   }
+-  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
++  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) 
++  {
++# if BOOST_VERSION == 104800
+     return e.underlying_desc.Id;
++# else
++    return e.underlying_descx.Id;
++# endif
+   }
+ }
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 8d01b36..16ca47b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ install_htmldoc.patch
 kwprocessxml_rpath.patch
 fix_format_not_a_string_FTBFS.patch
 workaround_strict-aliasing_in_mpi4py_MPI.patch
+fix_FTBFS_boost149.patch

-- 
Paraview packaging