Skip to content

Commit

Permalink
Add debian folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbuehlma
rbuehlma committed Sep 24, 2017
1 parent 8280157 commit a799d13
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 11 deletions.
12 changes: 2 additions & 10 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@ project(pvr.teleboy)
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
set(PC_RapidJSON_INCLUDEDIR ${PROJECT_SOURCE_DIR}/depends/target/rapidjson/native/build/dummy/include)

enable_language(CXX)

execute_process(
COMMAND make PREFIX=dummy
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/depends/target/rapidjson/
)


find_package(PkgConfig)
find_package(Kodi REQUIRED)
find_package(kodiplatform REQUIRED)
find_package(p8-platform REQUIRED)
Expand All @@ -34,7 +28,7 @@ set(TELEBOY_SOURCES
src/Curl.cpp
src/TeleBoy.cpp
src/UpdateThread.cpp
)
)

if(WIN32)
list(APPEND DEPLIBS ws2_32)
Expand All @@ -51,5 +45,3 @@ endif ( MSVC )
build_addon(pvr.teleboy TELEBOY DEPLIBS)

include(CPack)


7 changes: 7 additions & 0 deletions debian/changelog.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
kodi-pvr-teleboy (#PACKAGEVERSION#-#TAGREV#~#DIST#) #DIST#; urgency=low

[ kodi ]
* autogenerated dummy changelog

-- Nobody <nobody@kodi.tv> Sat, 01 Jun 2013 00:59:22 +0200

1 change: 1 addition & 0 deletions debian/compat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
22 changes: 22 additions & 0 deletions debian/control
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Source: kodi-pvr-teleboy
Priority: extra
Maintainer: rbuehlma <rene@buehlmann.net>
Build-Depends: debhelper (>= 9.0.0), cmake, pkg-config, libkodiplatform-dev (>= 17.1),
kodi-addon-dev, rapidjson-dev, libp8-platform-dev
Standards-Version: 3.9.4
Section: libs
Homepage: http://kodi.tv

Package: kodi-pvr-teleboy
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Teleboy PVR for Kodi
Teleboy PVR for Kodi

Package: kodi-pvr-teleboy-dbg
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: debug symbols for Teleboy PVR for Kodi
debug symbols for Teleboy PVR for Kodi
72 changes: 72 additions & 0 deletions debian/copyright
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: pvr.teleboy
Source: https://github.com/rbuehlma/pvr.teleboy

Files: *
Copyright: 2016-2017 rbuehlma
2016-2017 trummerjo
2005-2013 Team XBMC
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This package 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 this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

Files: lib/platform/*
Copyright: 2011-2015 Pulse-Eight
License: dual-licensed
This program is dual-licensed; 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 of the License, 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
.
Alternatively, you can license this library under a commercial license,
please contact Pulse-Eight Licensing for more information.
.
For more information contact:
Pulse-Eight Licensing <license@pulse-eight.com>
http://www.pulse-eight.com/
http://www.pulse-eight.net/

Files: debian/*
Copyright: 2015 Jean-Luc Barriere
2015 wsnipex <wsnipex@a1.net>
2017 rbuehlma
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This package 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 this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

2 changes: 2 additions & 0 deletions debian/kodi-pvr-zattoo.install
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
usr/lib/*
usr/share/*

This comment has been minimized.

Sign in to view

Copy link
@wsnipex

wsnipex Sep 25, 2017

kodi-pvr-zattoo.install -> kodi-pvr-teleboy.install

This comment has been minimized.

Sign in to view

Copy link
@rbuehlma

rbuehlma Sep 25, 2017

Author Owner

Done
24 changes: 24 additions & 0 deletions debian/rules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.

# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1

%:
dh $@

override_dh_auto_configure:
# USE_LTO breaks build
dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1

override_dh_strip:
dh_strip -pkodi-pvr-teleboy --dbg-package=kodi-pvr-teleboy-dbg

override_dh_installdocs:
dh_installdocs --link-doc=kodi-pvr-teleboy

1 change: 1 addition & 0 deletions debian/source/format
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0 (native)
2 changes: 1 addition & 1 deletion pvr.teleboy/addon.xml.in
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="pvr.teleboy" version="18.0.3" name="Teleboy PVR Client" provider-name="rbuehlma">
<addon id="pvr.teleboy" version="18.0.4" name="Teleboy PVR Client" provider-name="rbuehlma">

This comment has been minimized.

Sign in to view

Copy link
@wsnipex

wsnipex Sep 25, 2017

please break this down into 1/line, as on zattoo.

This comment has been minimized.

Sign in to view

Copy link
@rbuehlma

rbuehlma Sep 25, 2017

Author Owner

Done
<requires>@ADDON_DEPENDS@</requires>
<extension point="xbmc.pvrclient" library_@PLATFORM@="@LIBRARY_FILENAME@"/>
<extension point="xbmc.addon.metadata">
Expand Down
2 changes: 2 additions & 0 deletions pvr.teleboy/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
v18.0.4
- Add debian folder
v18.0.3
- Fix windows build
- Limit update threads to 1
Expand Down

6 comments on commit a799d13

@wsnipex
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.1")
-- Checking to see if CXX compiler accepts flag -flto
-- Checking to see if CXX compiler accepts flag -flto - yes
CMake Error at CMakeLists.txt:13 (find_package):
By not providing "FindRapidJSON.cmake" in CMAKE_MODULE_PATH this project
has asked CMake to find a package configuration file provided by
"RapidJSON", but CMake did not find one.

Could not find a package configuration file provided by "RapidJSON" with
any of the following names:

RapidJSONConfig.cmake
rapidjson-config.cmake

Add the installation prefix of "RapidJSON" to CMAKE_PREFIX_PATH or set
"RapidJSON_DIR" to a directory containing one of the above files. If
"RapidJSON" provides a separate development package or SDK, be sure it has
been installed.

-> missing FindRapidJSON.cmake

@rbuehlma
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@wsnipex
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works now. builds are up: https://launchpad.net/~team-xbmc/+archive/ubuntu/xbmc-nightly/+packages?field.name_filter=teleboy&field.status_filter=published&field.series_filter=

@rbuehlma
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great thanks for your help :)

@ksooo
Copy link
Collaborator

@ksooo ksooo commented on a799d13 Sep 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cosmetics: I would rename kodi-pvr-zattoo.install to kodi-pvr-teleboy.install

@rbuehlma
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already done

Please sign in to comment.