From 8fc893451ac374e9bee05d55a28a280e9c660987 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 04:46:40 +0100 Subject: [PATCH 1/9] update .gitignore --- .gitignore | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7d3579f..79abccf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,45 @@ # build artifacts build/ +pvr.*/addon.xml + +# Debian build files debian/changelog debian/files -debian/kodi-pvr-njoy-dbg.debhelper.log -debian/kodi-pvr-njoy-dbg.substvars -debian/kodi-pvr-njoy-dbg/ -debian/kodi-pvr-njoy.debhelper.log -debian/kodi-pvr-njoy.postinst.debhelper -debian/kodi-pvr-njoy.postrm.debhelper -debian/kodi-pvr-njoy.substvars -debian/kodi-pvr-njoy/ +debian/*.log +debian/*.substvars +debian/.debhelper/ debian/tmp/ +debian/kodi-pvr-*/ obj-x86_64-linux-gnu/ -pvr.njoy/addon.xml + +# commonly used editors +# vim +*.swp + +# Eclipse +*.project +*.cproject +.classpath +*.sublime-* +.settings/ + +# KDevelop 4 +*.kdev4 + +# gedit +*~ + +# CLion +/.idea # clion .idea/ -# Eclipse/CDT -.cproject -.project -.settings/ +# to prevent add after a "git format-patch VALUE" and "git add ." call +/*.patch + +# Visual Studio Code +.vscode + +# to prevent add if project code opened by Visual Studio over CMake file +.vs/ From 147037ef5be59cb6bd6f05fd530a592ec5e93fa2 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 04:48:33 +0100 Subject: [PATCH 2/9] update source license to 2020, use Kodi and spdx --- src/N7Xml.cpp | 9 +++++++-- src/N7Xml.h | 8 ++++++++ src/client.cpp | 21 ++++----------------- src/client.h | 24 ++++++------------------ 4 files changed, 25 insertions(+), 37 deletions(-) diff --git a/src/N7Xml.cpp b/src/N7Xml.cpp index 7a69114..913cc37 100644 --- a/src/N7Xml.cpp +++ b/src/N7Xml.cpp @@ -1,4 +1,10 @@ - +/* + * Copyright (C) 2005-2020 Team Kodi + * https://kodi.tv + * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. + */ #include "N7Xml.h" @@ -149,4 +155,3 @@ PVR_ERROR N7Xml::GetChannelStreamProperties(const PVR_CHANNEL* channel, PVR_NAME } return PVR_ERROR_UNKNOWN; } - diff --git a/src/N7Xml.h b/src/N7Xml.h index 6cbc687..8d82bb5 100644 --- a/src/N7Xml.h +++ b/src/N7Xml.h @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2005-2020 Team Kodi + * https://kodi.tv + * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. + */ + #pragma once #include "client.h" diff --git a/src/client.cpp b/src/client.cpp index bace03c..6ac8108 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1,22 +1,9 @@ /* - * Copyright (C) 2005-2012 Team XBMC - * http://xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html + * Copyright (C) 2005-2020 Team Kodi + * https://kodi.tv * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #include "client.h" diff --git a/src/client.h b/src/client.h index 08f7395..f9d99d4 100644 --- a/src/client.h +++ b/src/client.h @@ -1,25 +1,13 @@ -#pragma once /* - * Copyright (C) 2005-2012 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html + * Copyright (C) 2005-2020 Team Kodi + * https://kodi.tv * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ +#pragma once + #include "kodi/libXBMC_addon.h" #include "kodi/libXBMC_pvr.h" From e344a9dc3dfbc0bb1b356cb6be4cf33803894547 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 04:49:33 +0100 Subject: [PATCH 3/9] add GPL2 as LICENSE.md to addon --- LICENSE.md | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + 2 files changed, 265 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..b017086 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,264 @@ +The GNU General Public License, Version 2, June 1991 (GPLv2) +============================================================ + +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + + +Preamble +-------- + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to most +of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you can +do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a +fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show them +these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer +you this license which gives you legal permission to copy, distribute and/or +modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced by +others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish +to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's free +use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + +Terms And Conditions For Copying, Distribution And Modification +--------------------------------------------------------------- + +**0.** This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included without +limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is not +restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +**1.** You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the Program +a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at +your option offer warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you also +meet all of these conditions: + +* **a)** You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + +* **b)** You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, to + be licensed as a whole at no charge to all third parties under the terms of + this License. + +* **c)** If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the entire whole, +and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +**3.** You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and 2 +above provided that you also do one of the following: + +* **a)** Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above on + a medium customarily used for software interchange; or, + +* **b)** Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + +* **c)** Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only for + noncommercial distribution and only if you received the program in object + code or executable form with such an offer, in accord with Subsection b + above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all the +source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source code +from the same place counts as distribution of the source code, even though third +parties are not compelled to copy the source along with the object code. + +**4.** You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +**5.** You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you do +not accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +**6.** Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +**7.** If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution of +the Program by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain +entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and the +section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +**8.** If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +**9.** The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose any +version ever published by the Free Software Foundation. + +**10.** If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + + +No Warranty +----------- + +**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff --git a/README.md b/README.md index 2b50b62..1a8e8c2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](LICENSE.md) [![Build Status](https://travis-ci.org/kodi-pvr/pvr.njoy.svg?branch=Matrix)](https://travis-ci.org/kodi-pvr/pvr.njoy/branches) [![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.njoy?branchName=Matrix)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=65&branchName=Matrix) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) From 0e8e63a9b3d4a2d87c3857b2f848baa3b4e04fb0 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 04:59:47 +0100 Subject: [PATCH 4/9] update settings.xml to new format --- pvr.njoy/resources/settings.xml | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pvr.njoy/resources/settings.xml b/pvr.njoy/resources/settings.xml index a7dee5e..c4a4561 100644 --- a/pvr.njoy/resources/settings.xml +++ b/pvr.njoy/resources/settings.xml @@ -1,6 +1,27 @@ - - - + +
+ + + + 0 + 127.0.0.1 + + true + + + + + 0 + 80 + + 1 + 1 + 65535 + + + + + +
- From 8ba2785ab73959eecd4b9bb5255e285090d2fbe5 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 05:02:09 +0100 Subject: [PATCH 5/9] add assets for icon.png on addon.xml --- pvr.njoy/addon.xml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pvr.njoy/addon.xml.in b/pvr.njoy/addon.xml.in index cc833c8..706e9fa 100644 --- a/pvr.njoy/addon.xml.in +++ b/pvr.njoy/addon.xml.in @@ -67,5 +67,8 @@ Njoy N7 PVR 客户端 Njoy N7 PVR 用戶端 @PLATFORM@ + + icon.png + From 9a112dc8452094f0562b1be45622bd0fc3d0e706 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 05:31:07 +0100 Subject: [PATCH 6/9] add license and source/forum url to addon.xml --- pvr.njoy/addon.xml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pvr.njoy/addon.xml.in b/pvr.njoy/addon.xml.in index 706e9fa..760d4e9 100644 --- a/pvr.njoy/addon.xml.in +++ b/pvr.njoy/addon.xml.in @@ -67,6 +67,9 @@ Njoy N7 PVR 客户端 Njoy N7 PVR 用戶端 @PLATFORM@ + GPL-2.0 + https://github.com/kodi-pvr/pvr.njoy + https://forum.kodi.tv/forumdisplay.php?fid=173 icon.png From 79c9af5cf7b9e6cdcf0d50c38431e356fd2b6f9d Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 05:53:19 +0100 Subject: [PATCH 7/9] update debian build code --- debian/control | 2 +- debian/copyright | 6 ++++-- debian/kodi-pvr-njoy.install | 4 ++-- debian/source/format | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index f941670..59bf5c4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: extra Maintainer: Nobody Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev, libkodiplatform-dev (>= 16.0.0), kodi-addon-dev -Standards-Version: 3.9.4 +Standards-Version: 4.1.2 Section: libs Package: kodi-pvr-njoy diff --git a/debian/copyright b/debian/copyright index 0a951ef..30a9717 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,9 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: pvr.njoy +Source: https://github.com/kodi-pvr/pvr.njoy Files: * -Copyright: 2005-2013 Team XBMC +Copyright: 2005-2020 Team Kodi License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +23,8 @@ License: GPL-2+ Files: debian/* -Copyright: 2013 Arne Morten Kvarving +Copyright: 2020 Team Kodi + 2013 Arne Morten Kvarving 2013 wsnipex License: GPL-2+ This package is free software; you can redistribute it and/or modify diff --git a/debian/kodi-pvr-njoy.install b/debian/kodi-pvr-njoy.install index 54de7d8..db2d2dc 100644 --- a/debian/kodi-pvr-njoy.install +++ b/debian/kodi-pvr-njoy.install @@ -1,2 +1,2 @@ -usr/lib/*/kodi/addons/pvr.njoy/pvr.njoy.so* -usr/share/kodi/addons/pvr.njoy +usr/lib/* +usr/share/* diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) From d987a27e26c6df148026689e8e4e39365a7ddb77 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 15:21:29 +0100 Subject: [PATCH 8/9] add Jenkins CI status badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1a8e8c2..d7f339e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](LICENSE.md) [![Build Status](https://travis-ci.org/kodi-pvr/pvr.njoy.svg?branch=Matrix)](https://travis-ci.org/kodi-pvr/pvr.njoy/branches) [![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.njoy?branchName=Matrix)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=65&branchName=Matrix) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.njoy/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.njoy/branches/) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # Njoy PVR From f6d1272eaf159f4acfa4e1c41e63717b1def4c74 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Mar 2020 05:08:37 +0100 Subject: [PATCH 9/9] increase version to 4.1.2 --- pvr.njoy/addon.xml.in | 2 +- pvr.njoy/changelog.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pvr.njoy/addon.xml.in b/pvr.njoy/addon.xml.in index 760d4e9..0636fc6 100644 --- a/pvr.njoy/addon.xml.in +++ b/pvr.njoy/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.njoy/changelog.txt b/pvr.njoy/changelog.txt index 3124526..0618112 100644 --- a/pvr.njoy/changelog.txt +++ b/pvr.njoy/changelog.txt @@ -1,3 +1,11 @@ +v4.1.2 +- Update Debian build code +- Update with some minor cleanups +- Update settings.xml to use new format +- Cleanup source copyright to 2020, use Kodi as name and to match SPDX +- Add license name forum url and source url to addon.xml +- Add GPL2 license file and show GPL2 on README.md + v4.1.1 - Update PVR API 6.2.0