Skip to content

Commit

Permalink
Merge pull request #142 from kodi-pvr/krypton-backports
Browse files Browse the repository at this point in the history
Krypton backports
  • Loading branch information
Jalle19 authored Aug 6, 2017
2 parents 99138ad + 206b0cd commit b1eac6e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# build artifacts
build/
cmake-build-debug/
debian/changelog
debian/files
debian/kodi-pvr-iptvsimple-dbg.debhelper.log
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions debian/kodi-pvr-iptvsimple.install
Original file line number Diff line number Diff line change
@@ -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/*
2 changes: 1 addition & 1 deletion pvr.iptvsimple/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.iptvsimple"
version="2.4.12"
version="2.4.13"
name="PVR IPTV Simple Client"
provider-name="nightik">
<requires>
Expand Down
7 changes: 7 additions & 0 deletions pvr.iptvsimple/changelog.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit b1eac6e

Please sign in to comment.