[pdal] 05/12: Drop jsoncpp.patch, fixed upstream. Refresh privacy-breach.patch.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master-git
in repository pdal.

commit 87fe2c3a4370a1fb439e953b01e3e3dacf5a7792
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 30 15:46:29 2016 +0200

    Drop jsoncpp.patch, fixed upstream. Refresh privacy-breach.patch.
---
 debian/changelog                    |  1 +
 debian/patches/jsoncpp.patch        | 39 -------------------------------------
 debian/patches/privacy-breach.patch |  8 ++++----
 debian/patches/series               |  1 -
 4 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e4166d..f5de30f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pdal (1.2.0+git20160429-cbe9b08-1) UNRELEASED; urgency=medium
   * Update copyright file, changes:
     - Drop Files section for OGR.cpp, relicensed to BSD-3-Clause
     - Add license & copyright for arbiter files
+  * Drop jsoncpp.patch, fixed upstream. Refresh privacy-breach.patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 Apr 2016 15:30:38 +0200
 
diff --git a/debian/patches/jsoncpp.patch b/debian/patches/jsoncpp.patch
deleted file mode 100644
index c7ab562..0000000
--- a/debian/patches/jsoncpp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Link to system libjsoncpp if available.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1211
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -101,9 +101,20 @@ set(PDAL_BASE_CPP
-   ${PDAL_XML_SRC}
-   ${PDAL_LAZPERF_SRC}
-   ${DB_DRIVER_SRCS}
--  ${PROJECT_SOURCE_DIR}/vendor/jsoncpp-1.6.2/dist/jsoncpp.cpp
- )
- 
-+include(FindPkgConfig)
-+
-+pkg_search_module(JSONCPP jsoncpp>=1.6.2)
-+if(JSONCPP_FOUND)
-+  include_directories(${JSONCPP_INCLUDE_DIR})
-+else(JSONCPP_FOUND)
-+  set(PDAL_BASE_CPP
-+    ${PDAL_BASE_CPP}
-+    ${PROJECT_SOURCE_DIR}/vendor/jsoncpp-1.6.2/dist/jsoncpp.cpp
-+  )
-+endif(JSONCPP_FOUND)
-+
- list (APPEND PDAL_CPP ${PDAL_BASE_CPP} )
- list (APPEND PDAL_HPP ${PDAL_BASE_HPP} )
- 
-@@ -167,6 +178,10 @@ if (PDAL_HAVE_LIBXML2)
-     target_link_libraries(${PDAL_BASE_LIB_NAME} ${LIBXML2_LIBRARIES})
- endif()
- 
-+if(JSONCPP_FOUND)
-+    target_link_libraries(${PDAL_BASE_LIB_NAME} ${JSONCPP_LIBRARY})
-+endif(JSONCPP_FOUND)
-+
- #
- # On OSX we reexport the symbols in libpdal_util.dylib into libpdalcpp.dylib
- # so that users only need link libpdalcpp.
diff --git a/debian/patches/privacy-breach.patch b/debian/patches/privacy-breach.patch
index e365d91..21463ff 100644
--- a/debian/patches/privacy-breach.patch
+++ b/debian/patches/privacy-breach.patch
@@ -3,9 +3,9 @@ Description: Don't embedded external logo images.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: not-needed
 
---- a/doc/contributors.rst
-+++ b/doc/contributors.rst
-@@ -20,9 +20,6 @@ This page is to recognize these contribu
+--- a/doc/development/contributors.rst
++++ b/doc/development/contributors.rst
+@@ -16,9 +16,6 @@ This page is to recognize these contribu
  Engineering Contributors
  --------------------------------------------------------------------------------
  
@@ -15,7 +15,7 @@ Forwarded: not-needed
  `Hobu`_ is the primary company behind the design, testing, development, and
  distribution of PDAL. Two Hobu team members primarily interact with PDAL.
  `Howard Butler`_ founded the project, and he provides project leadership and
-@@ -34,9 +31,6 @@ new feature development of PDAL over the
+@@ -30,9 +27,6 @@ new feature development of PDAL over the
  .. _`Hobu`: http://hobu.co
  
  
diff --git a/debian/patches/series b/debian/patches/series
index 4371720..7ca3720 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-jsoncpp.patch
 privacy-breach.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.git