[SCM] Paraview packaging branch, master, updated. upstream/3.12.0-148-g6d0a50d

[Anton Gladky]

The following commit has been merged in the master branch:
commit 6ca32d8a077223ee0252b8b7c0361dceed4ce82d
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Feb 23 22:02:39 2012 +0100

    Remove fix_boost-1.48_compilation.patch. Seems upstream fixed boost-1.48 issue.

diff --git a/debian/patches/fix_boost-1.48_compilation.patch b/debian/patches/fix_boost-1.48_compilation.patch
deleted file mode 100644
index c11629e..0000000
--- a/debian/patches/fix_boost-1.48_compilation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix FTBFS with boost 1.48 "VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx:98:5: error: 'class boost::detail::reverse_graph_edge_descriptor<vtkEdgeType>' has no member named 'Id'"
-Author: Orion Poplawski
-Bug: http://www.vtk.org/Bug/view.php?id=12772
-Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-12-19
-
---- a/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -46,6 +46,15 @@
- 
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
- 
-+namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+    return e.Id;
-+  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+    return e.underlying_desc.Id;
-+  }
-+}
-+
- 
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
-@@ -95,7 +104,8 @@
- 
-     // Copy the vertex and edge data from the graph to the tree.
-     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
--    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+        unwrap_edge_id(e), tree_e.Id);
-   }
- 
- private:
diff --git a/debian/patches/series b/debian/patches/series
index d02b495..8d01b36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ install_htmldoc.patch
 kwprocessxml_rpath.patch
 fix_format_not_a_string_FTBFS.patch
 workaround_strict-aliasing_in_mpi4py_MPI.patch
-fix_boost-1.48_compilation.patch

-- 
Paraview packaging