[SCM] Paraview packaging branch, master, updated. upstream/3.12.0-109-g0717536

[Anton Gladky]

The following commit has been merged in the master branch:
commit 0717536c6a52d3032cbd474fd42158306f724756
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Nov 10 21:27:24 2011 +0100

    Update removesqlite.patch

diff --git a/debian/patches/removesqlite.patch b/debian/patches/removesqlite.patch
index 1ef4151..ef79aed 100644
--- a/debian/patches/removesqlite.patch
+++ b/debian/patches/removesqlite.patch
@@ -2,10 +2,8 @@ Description: Import patch from VTK to remove sqlite
 Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Last-Update: 2011-09-07
 
-Index: paraview/VTK/IO/vtkSQLiteDatabase.cxx
-===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteDatabase.cxx	2011-09-07 09:55:32.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteDatabase.cxx	2011-09-07 09:55:35.000000000 +0000
+--- a/VTK/IO/vtkSQLiteDatabase.cxx
++++ b/VTK/IO/vtkSQLiteDatabase.cxx
 @@ -29,7 +29,7 @@
  #include <vtksys/ios/fstream>
  #include <vtksys/ios/sstream>
@@ -77,10 +75,8 @@ Index: paraview/VTK/IO/vtkSQLiteDatabase.cxx
 -  return vtk_sqlite3_errmsg(this->SQLiteInstance);
 +  return sqlite3_errmsg(this->SQLiteInstance);
  }
-Index: paraview/VTK/IO/vtkSQLiteQuery.cxx
-===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteQuery.cxx	2011-09-07 09:55:32.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteQuery.cxx	2011-09-07 09:55:35.000000000 +0000
+--- a/VTK/IO/vtkSQLiteQuery.cxx
++++ b/VTK/IO/vtkSQLiteQuery.cxx
 @@ -25,7 +25,7 @@
  #include "vtkVariant.h"
  #include "vtkVariantArray.h"
@@ -466,10 +462,8 @@ Index: paraview/VTK/IO/vtkSQLiteQuery.cxx
      {
      vtksys_ios::ostringstream errormessage;
      errormessage << "sqlite_clear_bindings returned error: " << status;
-Index: paraview/VTK/IO/vtkSQLiteDatabase.h
-===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteDatabase.h	2011-09-07 09:55:32.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteDatabase.h	2011-09-07 09:55:35.000000000 +0000
+--- a/VTK/IO/vtkSQLiteDatabase.h
++++ b/VTK/IO/vtkSQLiteDatabase.h
 @@ -48,7 +48,7 @@
  class vtkSQLQuery;
  class vtkSQLiteQuery;
@@ -488,10 +482,8 @@ Index: paraview/VTK/IO/vtkSQLiteDatabase.h
    
    // We want this to be private, a user of this class
    // should not be setting this for any reason
-Index: paraview/VTK/IO/vtkSQLiteQuery.h
-===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteQuery.h	2011-09-07 09:55:32.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteQuery.h	2011-09-07 09:55:35.000000000 +0000
+--- a/VTK/IO/vtkSQLiteQuery.h
++++ b/VTK/IO/vtkSQLiteQuery.h
 @@ -46,7 +46,7 @@
  class vtkSQLiteDatabase;
  class vtkVariant;
@@ -510,23 +502,19 @@ Index: paraview/VTK/IO/vtkSQLiteQuery.h
    bool InitialFetch;
    int InitialFetchResult;
    char *LastErrorText;
-Index: paraview/VTK/Utilities/CMakeLists.txt
-===================================================================
---- paraview.orig/VTK/Utilities/CMakeLists.txt	2011-09-07 09:55:32.000000000 +0000
-+++ paraview/VTK/Utilities/CMakeLists.txt	2011-09-07 09:55:35.000000000 +0000
-@@ -42,7 +42,7 @@
-   ADD_SUBDIRECTORY(vtkmetaio)
-   SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio)
+--- a/VTK/Utilities/CMakeLists.txt
++++ b/VTK/Utilities/CMakeLists.txt
+@@ -47,7 +47,7 @@
+     SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio)
+   ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
  ENDIF(VTK_USE_METAIO)
 -ADD_SUBDIRECTORY(vtksqlite)
 +#ADD_SUBDIRECTORY(vtksqlite)
  
  IF(VTK_HAS_EXODUS)
    ADD_SUBDIRECTORY(vtkexodus2)
-Index: paraview/VTK/IO/CMakeLists.txt
-===================================================================
---- paraview.orig/VTK/IO/CMakeLists.txt	2011-09-07 09:55:45.000000000 +0000
-+++ paraview/VTK/IO/CMakeLists.txt	2011-09-07 09:55:51.000000000 +0000
+--- a/VTK/IO/CMakeLists.txt
++++ b/VTK/IO/CMakeLists.txt
 @@ -19,7 +19,7 @@
  SET(KIT_JAVA_LIBS vtkFilteringJava)
  SET(KIT_INTERFACE_LIBRARIES vtkFiltering)

-- 
Paraview packaging