From 973e0211f9ec6a641d2a9bc58cf2db99b38292ef Mon Sep 17 00:00:00 2001 From: "Michael T. DeGuzis" Date: Thu, 23 Feb 2017 23:50:47 -0500 Subject: [PATCH 1/4] fix install path fix install path fix install path simplify installation file --- debian/kodi-pvr-iptvsimple.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/kodi-pvr-iptvsimple.install b/debian/kodi-pvr-iptvsimple.install index a32115901..db2d2dc76 100644 --- a/debian/kodi-pvr-iptvsimple.install +++ b/debian/kodi-pvr-iptvsimple.install @@ -1,2 +1,2 @@ -usr/lib/*/addons/pvr.iptvsimple/pvr.iptvsimple.so* usr/lib/kodi/addons/pvr.iptvsimple -usr/share/kodi/addons/pvr.iptvsimple +usr/lib/* +usr/share/* From eba147c751cb7c29b2ba4a80d6e4de76ebb52668 Mon Sep 17 00:00:00 2001 From: Sam Stenvall Date: Sun, 6 Aug 2017 20:36:04 +0300 Subject: [PATCH 2/4] Bump version to v2.4.13, add changelog entries --- pvr.iptvsimple/addon.xml.in | 2 +- pvr.iptvsimple/changelog.txt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in index a0fc5e754..f5a0abd26 100644 --- a/pvr.iptvsimple/addon.xml.in +++ b/pvr.iptvsimple/addon.xml.in @@ -1,7 +1,7 @@ diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt index bb7fae3c9..8ee8fe3de 100644 --- a/pvr.iptvsimple/changelog.txt +++ b/pvr.iptvsimple/changelog.txt @@ -1,3 +1,10 @@ +v2.4.13 +- fixed install path in the Debian package +- remove line size limitation when parsing M3U files + +v2.4.12 +- updated language files from Transifex + v2.4.10 - added Channel number tvg-chno to m3u From ccaf3389eb0ce458891d35723653248cc4cc8524 Mon Sep 17 00:00:00 2001 From: Sam Stenvall Date: Sun, 6 Aug 2017 20:39:40 +0300 Subject: [PATCH 3/4] Make Travis CI work on the Krypton branch too --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a310674a1..a7089ffd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,8 @@ before_install: # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone --depth=1 https://github.com/xbmc/xbmc.git + - git clone -b Krypton --depth=1 https://github.com/xbmc/xbmc.git - cd pvr.iptvsimple && mkdir build && cd build - - cmake -DADDONS_TO_BUILD=pvr.iptvsimple -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons + - cmake -DADDONS_TO_BUILD=pvr.iptvsimple -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/project/cmake/addons script: make From 206b0cd3e18de6abbaa27aa1d31ad05a715cf5d8 Mon Sep 17 00:00:00 2001 From: Sam Stenvall Date: Sun, 6 Aug 2017 20:40:06 +0300 Subject: [PATCH 4/4] Ignore cmake-debug-build/, CLion creates it automatically unless configured --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f8be080e6..c9fb2cde6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # build artifacts build/ +cmake-build-debug/ debian/changelog debian/files debian/kodi-pvr-iptvsimple-dbg.debhelper.log