[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 eb136f884374d4b00ad4b9525c4a82e01b47c2ae
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Feb 23 21:46:26 2012 +0100

    Update patches.

diff --git a/debian/patches/fix_vtkxdmf_xt.patch b/debian/patches/fix_vtkxdmf_xt.patch
index 367de88..1157931 100644
--- a/debian/patches/fix_vtkxdmf_xt.patch
+++ b/debian/patches/fix_vtkxdmf_xt.patch
@@ -4,10 +4,8 @@ Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Bug: http://paraview.org/Bug/view.php?id=12576
 Last-Update: 2011-09-07
 
-Index: paraview/Utilities/Xdmf2/vtk/CMakeLists.txt
-===================================================================
---- paraview.orig/Utilities/Xdmf2/vtk/CMakeLists.txt	2011-09-07 08:39:36.000000000 +0000
-+++ paraview/Utilities/Xdmf2/vtk/CMakeLists.txt	2011-09-07 08:39:52.000000000 +0000
+--- a/Utilities/Xdmf2/vtk/CMakeLists.txt
++++ b/Utilities/Xdmf2/vtk/CMakeLists.txt
 @@ -105,6 +105,7 @@
    ELSE(VTK_USE_PARALLEL)
      TARGET_LINK_LIBRARIES(vtkXdmf vtkIO Xdmf vtkRendering)
diff --git a/debian/patches/paraview-fix-libav07-compat.patch b/debian/patches/paraview-fix-libav07-compat.patch
index 3e32e9d..5055516 100644
--- a/debian/patches/paraview-fix-libav07-compat.patch
+++ b/debian/patches/paraview-fix-libav07-compat.patch
@@ -4,9 +4,9 @@ Author: Moritz Mühlenhoff <jmm at inutil.org>
 Bug-Debian: http://bugs.debian.org/638246
 Last-Update: <2011-09-02>
 
---- paraview-3.10.1.orig/VTK/IO/vtkFFMPEGWriter.cxx
-+++ paraview-3.10.1/VTK/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
+--- a/VTK/IO/vtkFFMPEGWriter.cxx
++++ b/VTK/IO/vtkFFMPEGWriter.cxx
+@@ -123,7 +123,7 @@
      }
  
    //choose avi media file format
@@ -15,7 +15,7 @@ Last-Update: <2011-09-02>
    if (!this->avOutputFormat) 
      {
      vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
+@@ -150,7 +150,7 @@
    //Set up the codec.
    AVCodecContext *c = this->avStream->codec;
    c->codec_id = (CodecID)this->avOutputFormat->video_codec;
@@ -24,7 +24,7 @@ Last-Update: <2011-09-02>
    c->width = this->Dim[0];
    c->height = this->Dim[1];
    c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -343,7 +343,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+@@ -343,7 +343,7 @@
      pkt.stream_index = this->avStream->index;
      if (cc->coded_frame->key_frame) //treat keyframes well
        {

-- 
Paraview packaging