[springlobby] 04/05: Drop FindJsoncpp.patch. Fixed upstream.

Markus Koschany apo at moszumanska.debian.org
Tue Apr 19 08:34:12 UTC 2016


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

apo pushed a commit to branch master
in repository springlobby.

commit 919fa8d53e87b5d193e599fabc111f2f7f7fc330
Author: Markus Koschany <apo at debian.org>
Date:   Tue Apr 19 09:15:14 2016 +0200

    Drop FindJsoncpp.patch. Fixed upstream.
---
 debian/patches/FindJsoncpp.patch | 36 ------------------------------------
 debian/patches/series            |  1 -
 2 files changed, 37 deletions(-)

diff --git a/debian/patches/FindJsoncpp.patch b/debian/patches/FindJsoncpp.patch
deleted file mode 100644
index a07561a..0000000
--- a/debian/patches/FindJsoncpp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 11 Apr 2016 05:22:24 +0200
-Subject: FindJsoncpp
-
----
- src/lsl/CMakeLists.txt | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/lsl/CMakeLists.txt b/src/lsl/CMakeLists.txt
-index 365cdf7..8b1d4bb 100644
---- a/src/lsl/CMakeLists.txt
-+++ b/src/lsl/CMakeLists.txt
-@@ -137,7 +137,22 @@ if (LSL_JSONCPP_INTERNAL)
- 		${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp/src/lib_json/json_writer.cpp
- 	)
- else()
--        find_package(Jsoncpp REQUIRED)
-+INCLUDE(FindPkgConfig)
-+if(PKG_CONFIG_FOUND)
-+	pkg_check_modules(Jsoncpp_PKGCONF jsoncpp)
-+endif()
-+# Include dir
-+find_path(Jsoncpp_INCLUDE_DIR
-+  NAMES json/features.h
-+  PATH_SUFFIXES jsoncpp
-+  PATHS ${Jsoncpp_PKGCONF_INCLUDE_DIRS} # /usr/include/jsoncpp/json
-+)
-+
-+# Finally the library itself
-+find_library(Jsoncpp_LIBRARY
-+  NAMES jsoncpp
-+  PATHS ${Jsoncpp_PKGCONF_LIBRARY_DIRS}
-+)
- endif()
- 
- add_subdirectory( src )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8a1e79c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-FindJsoncpp.patch

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



More information about the Pkg-games-commits mailing list