[SCM] kodiplatform/master: Merge tag 'upstream/17.0.0' into debian

Tue Mar 1 11:54:03 UTC 2016

Merge pull request #19 from wsnipex/master
[debian] bump package version to v17
Merge pull request #8 from wsnipex/master
Merge pull request #15 from Memphiz/tvos
Merge pull request #18 from garbear/p8-rename
Fix build after platform rename
Merge pull request #16 from ProfessorKaos64/master
update source code to use renamed platform pkg
[tvos] - remove iokit linkage
Merge pull request #12 from a1rwulf/multiarch
fixed: libdir in UseMultiArch.cmake default to lib
Merge pull request #11 from Montellese/darwin_to_osx
replace "darwin" with "osx" for CORE_SYSTEM_NAME
[debian] add TAG replacement var to changelog.in
Merge pull request #7 from wsnipex/platform
[debian] fix packaging after version bump
Merge pull request #6 from wsnipex/master
[debian] bump version forgotten in #5
Merge pull request #5 from opdenkamp/splitplatform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 05f3f66fa5c4ac15c50903f1e03563ad614156f7
X-Git-Newrev: 4c315d947dee64b79971ff3b57edbbea08fce838

The following commit has been merged in the master branch:
commit ecdd4fe35351783a7d1ef189a6015980106a7983
Merge: a8d401b5ff490ee2e2764c082716e33b4857f8ed 92583ef9f87bfcea1f2b4fc1310fdc673a2fe924
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Mar 1 12:01:37 2016 +0100

    Merge tag 'upstream/17.0.0' into debian
    
    Upstream version 17.0.0
    
    Conflicts:
    	debian/changelog
    	debian/changelog.in
    	debian/control
    	debian/libkodiplatform15.install
    	debian/libkodiplatform16.install
    	debian/libkodiplatform17.install

diff --combined debian/changelog
index b9ac621,82e757e..d5c88dd

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,14 +1,56 @@@
 -kodiplatform (17.0.0-1~trusty) trusty; urgency=medium
++kodiplatform (17.0.0-1) UNRELEASED; urgency=medium
+ 
 -  * adjust to libplatform rename to libp8-platform
++  * New upstream release 17.0
++    - Switch to p8-platform from (cec-)platform
+ 
 - -- wsnipex <wsnipex at a1.net>  Thu, 12 Feb 2015 13:28:01 +0100
++ -- Balint Reczey <balint at balintreczey.hu>  Tue, 01 Mar 2016 11:58:23 +0100
++
 +kodiplatform (16.0.0-2) unstable; urgency=medium
 +
 +  * Drop build-dependency on kodi-bin
 +    *.cmake files are now shipped by kodi-addons-dev
 +  * Fix Multimedia Team's email address.
 +    Thanks to Felipe Sateler
 +  * Stop providing virtual packages, they are not needed
 +  * Handle transition from libkodiplatform16v4
  
 -kodiplatform (16.0.0-1~trusty) trusty; urgency=medium
 + -- Balint Reczey <balint at balintreczey.hu>  Fri, 30 Oct 2015 19:44:27 +0400
  
 +kodiplatform (16.0.0-1) unstable; urgency=medium
 +
 +  [ Wolfgang Schupp ]
 +  * [debian] bump version forgotten in #5
 +  * [debian] fix packaging after version bump
 +
 +  [ Lars Op den Kamp ]
    * split up into libplatform and libkodiplatform, and removed libCEC-only code
  
 - -- Lars Op den Kamp <lars at opdenkamp.eu>  Thu, 20 Apr 2015 12:16:17 +0100
 +  [ Balint Reczey ]
 +  * Add configuration file for git-buildpackage
 +  * Change build-dependencies to match package names in Debian
 +  * Move to 3.0 (quilt) package format
 +  * Use the cec-platform name instead of platform
 +  * Add myself as Uploader
 +  * Extend package descriptions
 +  * Update debian/copyright
 +  * Bump compat level to 9
 +  * Bump standards version to 3.9.6
 +  * Simplify debian/rules
 +  * Install CMake and pkg-config files to multiarch dir
 +  * Make libkodiplatform-dev depend on misc:Depends
 +  * Don't duplicate Section: libs in debian/control
 +  * Add homepage
 +  * Don't set obsolete flags in pkg-config file
 +  * Fix SOVERSION of libkodiplatform.
 +    Also fix SOVERSION to be one single number
 +  * Make package team-maintained
 +  * Add symbols file
 +  * First upload to Debian (Closes: #798489)
 +  * Build depend on kodi-bin which provides kodi .cmake files
 +  * Build-depend on GCC 5
 +  * Fix (cec-)platform dependencies
 +
 + -- Balint Reczey <balint at balintreczey.hu>  Wed, 09 Sep 2015 18:48:12 +0200
  
  kodiplatform (15.0.0-1~trusty) trusty; urgency=medium
  
diff --combined debian/control
index 9d78906,874527f..ccd45a3
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,24 +1,33 @@@
  Source: kodiplatform
  Priority: extra
 -Maintainer: Arne Morten Kvarving <arne.morten.kvarving at sintef.no>
 -Build-Depends: debhelper (>= 8.0.0), cmake, libtinyxml-dev, kodi-addon-dev, libp8-platform-dev
 -Standards-Version: 3.9.5
 +Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Uploaders: Arne Morten Kvarving <arne.morten.kvarving at sintef.no>,
 +           Balint Reczey <balint at balintreczey.hu>
- Build-Depends: debhelper (>= 9~), cmake, libtinyxml-dev, kodi-addons-dev (>= 15.2~rc1+dfsg1-1~),
-                libcec-platform-dev, g++ (>= 4:5.2)
++Build-Depends: debhelper (>= 9~), cmake, libtinyxml-dev, kodi-addons-dev (>= 16.0~),
++               libp8-platform-dev, g++ (>= 4:5.2)
 +Standards-Version: 3.9.6
  Section: libs
 +Homepage: https://github.com/xbmc/kodi-platform
  
  Package: libkodiplatform-dev
  Section: libdevel
  Architecture: any
  Multi-Arch: same
 -Depends: libkodiplatform17 (= ${binary:Version}), libtinyxml-dev, libp8-platform-dev
 -Provides: libkodiplatform-dev
 +Depends: libkodiplatform16 (= ${binary:Version}), libtinyxml-dev,
-          libcec-platform-dev, ${misc:Depends}
++         libp8-platform-dev, ${misc:Depends}
  Description: Kodi platform support library -- development files
 - Kodi platform support library
 + Kodi platform support library containing utility functions for
 + accessing XML files.
 + .
 + These are the development files for libkodiplatform, needed only if you
 + wish to write software which uses it.
  
 -Package: libkodiplatform17
 -Section: libs
 +Package: libkodiplatform16
  Architecture: any
  Multi-Arch: same
 -Depends: ${shlibs:Depends}, ${misc:Depends}, libp8-platform2
 -Provides: libkodiplatform
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Breaks: libkodiplatform16v4
 +Replaces: libkodiplatform16v4
  Description: Kodi platform support library
 - Kodi platform support library
 + Kodi platform support library containing utility functions for
 + accessing XML files.

-- 
kodiplatform packaging

