[paraview] 02/02: Remove patch, applied by upstream.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository paraview.

commit 762474f0e924f5a0274d6f02edcbb72b5540a7a8
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jan 30 21:32:35 2014 +0100

    Remove patch, applied by upstream.
---
 debian/changelog                     |  8 --------
 debian/paraview.install              |  3 +--
 debian/patches/series                |  1 -
 debian/patches/use_system_json.patch | 32 --------------------------------
 debian/rules                         |  1 +
 5 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fd6d25..e9646b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-paraview (4.0.1-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * debian/paraview.install:
-    - add usr/bin/vtkProcessShader
-
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Sun, 06 Oct 2013 16:57:40 +0200
-
 paraview (4.0.1-1) unstable; urgency=low
 
   * [8b91fed] Use packages eigen3 instead of embedded.
diff --git a/debian/paraview.install b/debian/paraview.install
index 27e434f..f0d4dd0 100644
--- a/debian/paraview.install
+++ b/debian/paraview.install
@@ -14,6 +14,5 @@ usr/lib/paraview/*.so.*
 usr/lib/paraview/*.so
 usr/lib/cmake/paraview/*.png
 usr/lib/cmake/paraview/branded_splash.png usr/share/doc/paraview/images/CMake/
-usr/lib/paraview-4.0/*.so usr/lib/
+usr/lib/paraview-4.1/*.so usr/lib/
 usr/lib/paraview/.plugins
-usr/bin/vtkProcessShader
diff --git a/debian/patches/series b/debian/patches/series
index fa3626f..12c90db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix_manpages_errors.patch
-use_system_json.patch
diff --git a/debian/patches/use_system_json.patch b/debian/patches/use_system_json.patch
deleted file mode 100644
index f3ddb10..0000000
--- a/debian/patches/use_system_json.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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))
- 
diff --git a/debian/rules b/debian/rules
index ef958d1..5fa9042 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ extra_flags += -Wno-dev \
 	-DBUILD_SHARED_LIBS=ON \
 	-DVTK_USE_SYSTEM_FREETYPE=ON \
 	-DVTK_USE_SYSTEM_JPEG=ON \
+	-DVTK_USE_SYSTEM_JSON=ON \
 	-DVTK_USE_SYSTEM_PNG=ON \
 	-DBUILD_TESTING=OFF \
 	-DVTK_USE_MPEG2_ENCODER=OFF \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git