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

    Update patches.

diff --git a/debian/patches/install_htmldoc.patch b/debian/patches/install_htmldoc.patch
index caa3f26..0f118ae 100644
--- a/debian/patches/install_htmldoc.patch
+++ b/debian/patches/install_htmldoc.patch
@@ -2,11 +2,9 @@ Description: Fix installing of html-documentation
 Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Last-Update: 2011-09-14
 
-Index: paraview/Documentation/CMakeLists.txt
-===================================================================
---- paraview.orig/Documentation/CMakeLists.txt	2011-09-11 15:36:26.000000000 +0000
-+++ paraview/Documentation/CMakeLists.txt	2011-09-11 16:05:26.000000000 +0000
-@@ -110,7 +110,11 @@
+--- a/Documentation/CMakeLists.txt
++++ b/Documentation/CMakeLists.txt
+@@ -56,7 +56,11 @@
        DESTINATION ${PV_INSTALL_DOC_DIR}
        COMPONENT Runtime)
  ENDIF()
diff --git a/debian/patches/kwprocessxml_rpath.patch b/debian/patches/kwprocessxml_rpath.patch
index 84312d2..b36feb6 100644
--- a/debian/patches/kwprocessxml_rpath.patch
+++ b/debian/patches/kwprocessxml_rpath.patch
@@ -4,10 +4,8 @@ Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Bug-Debian: http://bugs.debian.org/640305
 Last-Update: 2011-09-13
 
-Index: paraview/Common/KWCommon/CMakeLists.txt
-===================================================================
---- paraview.orig/Common/KWCommon/CMakeLists.txt	2011-09-13 16:33:23.000000000 +0000
-+++ paraview/Common/KWCommon/CMakeLists.txt	2011-09-13 16:33:35.000000000 +0000
+--- a/Common/KWCommon/CMakeLists.txt
++++ b/Common/KWCommon/CMakeLists.txt
 @@ -225,7 +225,7 @@
  IF(KWCOMMON_BUILD_PROCESSXML)
    # For shared libraries on non-windows systems use the KWSys shared-forward
diff --git a/debian/patches/removesqlite.patch b/debian/patches/removesqlite.patch
index ef79aed..3467fa9 100644
--- a/debian/patches/removesqlite.patch
+++ b/debian/patches/removesqlite.patch
@@ -504,7 +504,7 @@ Last-Update: 2011-09-07
    char *LastErrorText;
 --- a/VTK/Utilities/CMakeLists.txt
 +++ b/VTK/Utilities/CMakeLists.txt
-@@ -47,7 +47,7 @@
+@@ -55,7 +55,7 @@
      SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio)
    ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
  ENDIF(VTK_USE_METAIO)
@@ -518,7 +518,7 @@ Last-Update: 2011-09-07
 @@ -19,7 +19,7 @@
  SET(KIT_JAVA_LIBS vtkFilteringJava)
  SET(KIT_INTERFACE_LIBRARIES vtkFiltering)
- SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx
+ SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx LSDyna
 -  ${_VTK_METAIO_LIB} vtksqlite
 +  ${_VTK_METAIO_LIB} sqlite3
    ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES}

-- 
Paraview packaging