[SCM] kodi-pvr-njoy/master: Switch to p8-platform from (cec-)platform

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 567f1ae7daa8eddb1447232791c686cbcdbdac33
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Mar 3 14:36:16 2016 +0100

    Switch to p8-platform from (cec-)platform

diff --git a/debian/control b/debian/control
index 25fb808..4346b0a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Balint Reczey <balint at balintreczey.hu>
 Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev,
-               libkodiplatform-dev (>= 16.0.0), kodi-addons-dev
+               libkodiplatform-dev (>= 17.0.0), kodi-addons-dev
 Standards-Version: 3.9.7
 Section: libs
 Homepage: https://github.com/kodi-pvr/pvr.njoy.git
diff --git a/debian/patches/0001-src-Update-to-p8-platform.patch b/debian/patches/0001-src-Update-to-p8-platform.patch
new file mode 100644
index 0000000..1cfac97
--- /dev/null
+++ b/debian/patches/0001-src-Update-to-p8-platform.patch
@@ -0,0 +1,39 @@
+From 32ebe815e2993aa9a3b3529928de96edddd5c47e Mon Sep 17 00:00:00 2001
+From: "h.udo" <hudokkow at gmail.com>
+Date: Wed, 6 Jan 2016 15:08:59 +0000
+Subject: [PATCH 1/2] [src] Update to p8-platform
+
+---
+ src/client.cpp | 2 +-
+ src/client.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/client.cpp b/src/client.cpp
+index d2e3cdd..366fa94 100644
+--- a/src/client.cpp
++++ b/src/client.cpp
+@@ -23,7 +23,7 @@
+ #include "kodi/xbmc_pvr_dll.h"
+ #include "kodi/libKODI_guilib.h"
+ #include "N7Xml.h"
+-#include "platform/util/util.h"
++#include "p8-platform/util/util.h"
+ 
+ using namespace std;
+ using namespace ADDON;
+diff --git a/src/client.h b/src/client.h
+index 900c11a..a5032eb 100644
+--- a/src/client.h
++++ b/src/client.h
+@@ -20,7 +20,7 @@
+  *
+  */
+ 
+-#include "platform/util/StdString.h"
++#include "p8-platform/util/StdString.h"
+ #include "kodi/libXBMC_addon.h"
+ #include "kodi/libXBMC_pvr.h"
+ 
+-- 
+2.1.4
+
diff --git a/debian/patches/0002-cmake-Update-to-p8-platform.patch b/debian/patches/0002-cmake-Update-to-p8-platform.patch
new file mode 100644
index 0000000..9c99815
--- /dev/null
+++ b/debian/patches/0002-cmake-Update-to-p8-platform.patch
@@ -0,0 +1,38 @@
+From 8c759ad83830321f24d374882826162b2088dbf6 Mon Sep 17 00:00:00 2001
+From: "h.udo" <hudokkow at gmail.com>
+Date: Wed, 6 Jan 2016 15:21:44 +0000
+Subject: [PATCH 2/2] [cmake] Update to p8-platform
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2fc815c..93399dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,10 +11,10 @@ option(PACKAGE_ZIP "Package Zip file?" OFF)
+ find_package(TinyXML REQUIRED)
+ find_package(kodi REQUIRED)
+ find_package(kodiplatform REQUIRED)
+-find_package(platform REQUIRED)
++find_package(p8-platform REQUIRED)
+ 
+ include_directories(${kodiplatform_INCLUDE_DIRS}
+-                    ${platform_INCLUDE_DIRS}
++                    ${p8-platform_INCLUDE_DIRS}
+                     ${TINYXML_INCLUDE_DIR}
+                     ${KODI_INCLUDE_DIR})
+ 
+@@ -22,7 +22,7 @@ set(NJOY_SOURCES src/client.cpp
+                  src/N7Xml.cpp)
+ 
+ set(DEPLIBS ${kodiplatform_LIBRARIES}
+-            ${platform_LIBRARIES}
++            ${p8-platform_LIBRARIES}
+             ${TINYXML_LIBRARIES})
+ 
+ build_addon(pvr.njoy NJOY DEPLIBS)
+-- 
+2.1.4
+
diff --git a/debian/patches/01_use_cec-platform.patch b/debian/patches/01_use_cec-platform.patch
deleted file mode 100644
index 70bf7c7..0000000
--- a/debian/patches/01_use_cec-platform.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Use platform library under libcec-platform name.
- The library is renamed for packaging it in Debian under a less generic name.
- .
-Author: Balint Reczey <balint at balintreczey.hu>
-Forwarded: not-needed
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,10 +11,10 @@
- find_package(TinyXML REQUIRED)
- find_package(kodi REQUIRED)
- find_package(kodiplatform REQUIRED)
--find_package(platform REQUIRED)
-+find_package(cec-platform REQUIRED)
- 
- include_directories(${kodiplatform_INCLUDE_DIRS}
--                    ${platform_INCLUDE_DIRS}
-+                    ${cec-platform_INCLUDE_DIRS}
-                     ${TINYXML_INCLUDE_DIR}
-                     ${KODI_INCLUDE_DIR})
- 
-@@ -22,7 +22,7 @@
-                  src/N7Xml.cpp)
- 
- set(DEPLIBS ${kodiplatform_LIBRARIES}
--            ${platform_LIBRARIES}
-+            ${cec-platform_LIBRARIES}
-             ${TINYXML_LIBRARIES})
- 
- build_addon(pvr.njoy NJOY DEPLIBS)
diff --git a/debian/patches/series b/debian/patches/series
index d6fa0e7..da7fc4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-01_use_cec-platform.patch
+0001-src-Update-to-p8-platform.patch
+0002-cmake-Update-to-p8-platform.patch

-- 
kodi-pvr-njoy packaging