[SCM] Paraview packaging branch, master, updated. debian/4.0.0_rc1-1-7-gc9b1653

[Anton Gladky]

The following commit has been merged in the master branch:
commit c9b16530280a0d54972baa7c90b8b7a78dc0bddd
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 13 20:58:26 2013 +0200

    Use system packaged json instead of embedded.

diff --git a/debian/control b/debian/control
index 45d690e..aba8e54 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.3),
  libxml2-dev, libexpat-dev,
  zlib1g-dev, libfreetype6-dev, libmysqlclient-dev, libpq-dev, libtheora-dev, 
  libogg-dev, mpi-default-dev, mpi-default-bin, libhdf5-dev (>= 1.8.8), hdf5-tools,
- libgl2ps-dev, libqtwebkit-dev (>=2.2.1), libeigen3-dev
+ libgl2ps-dev, libqtwebkit-dev (>=2.2.1), libeigen3-dev, libjsoncpp-dev
 Standards-Version: 3.9.4
 Homepage: http://www.paraview.org/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/paraview.git
diff --git a/debian/patches/series b/debian/patches/series
index 12c90db..fa3626f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_manpages_errors.patch
+use_system_json.patch
diff --git a/debian/patches/use_system_json.patch b/debian/patches/use_system_json.patch
new file mode 100644
index 0000000..f3ddb10
--- /dev/null
+++ b/debian/patches/use_system_json.patch
@@ -0,0 +1,32 @@
+Description: Use packaged version of json instead of embedded one.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-06-13
+
+--- a/VTK/IO/Geometry/module.cmake
++++ b/VTK/IO/Geometry/module.cmake
+@@ -7,7 +7,6 @@
+     vtkCommonMisc
+     vtkIOCore
+     vtkzlib
+-    vtkjsoncpp
+   TEST_DEPENDS
+     vtkIOAMR
+     vtkIOLegacy
+--- a/VTK/IO/Geometry/CMakeLists.txt
++++ b/VTK/IO/Geometry/CMakeLists.txt
+@@ -41,3 +41,4 @@
+   )
+ 
+ vtk_module_library(vtkIOGeometry ${Module_SRCS})
++target_link_libraries(vtkIOGeometry jsoncpp)
+--- a/VTK/IO/Geometry/vtkPlot3DMetaReader.cxx
++++ b/VTK/IO/Geometry/vtkPlot3DMetaReader.cxx
+@@ -32,7 +32,7 @@
+ #if defined(WIN32) && defined(VTK_BUILD_SHARED_LIBS)
+ # define JSON_DLL
+ #endif
+-#include <json/json.h>
++#include <jsoncpp/json/json.h>
+ 
+ #define CALL_MEMBER_FN(object,ptrToMember)  ((object).*(ptrToMember))
+ 

-- 
Paraview packaging