[SCM] xbmc-pvr-addons/master: Use XBMC Addons headers from xbmc-addons-dev

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9513d82ba705fa72595fc8cc9ac94fe56ec2b3a1
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun May 4 15:58:01 2014 +0200

    Use XBMC Addons headers from xbmc-addons-dev
    
    Also build-depend on xbmc-addons-dev and make binary packages depend
    on xbmc with version of xbmc-addons-dev or higher.

diff --git a/debian/control b/debian/control
index 0427926..c48cf8f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: video
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Balint Reczey <balint at balintreczey.hu>
-Build-Depends: debhelper (>= 9), autoconf, autopoint | gettext, automake, libtool, libboost-thread-dev, libmysqlclient-dev, pkg-config, vdr-dev (>= 1.7.17), libtinyxml-dev (>= 2.6.2), libjsoncpp-dev,  libavcodec-dev
+Build-Depends: debhelper (>= 9), autoconf, autopoint | gettext, automake, libtool, libboost-thread-dev, libmysqlclient-dev, pkg-config, vdr-dev (>= 1.7.17), libtinyxml-dev (>= 2.6.2), libjsoncpp-dev,  libavcodec-dev, xbmc-addons-dev
 Standards-Version: 3.9.5
 Homepage: https://github.com/opdenkamp/xbmc-pvr-addons.git
 Vcs-Git: git://git.debian.org/pkg-multimedia/xbmc-pvr-addons.git
@@ -11,7 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xbmc-pvr-addons.
 
 Package: xbmc-pvr-mythtv-cmyth
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12), libmysqlclient19 | libmysqlclient18 | libmysqlclient17 | libmysqlclient16 | libmysqlclient15 | libmysqlclient14
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}, libmysqlclient19 | libmysqlclient18 | libmysqlclient17 | libmysqlclient16 | libmysqlclient15 | libmysqlclient14
 Description: XBMC PVR Addon MythTv - Cmyth
  This package contains the Cmyth PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment
@@ -19,7 +19,7 @@ Description: XBMC PVR Addon MythTv - Cmyth
 
 Package: xbmc-pvr-vuplus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Addon Vuplus
  This package contains the Vuplus PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment
@@ -27,7 +27,7 @@ Description: XBMC PVR Addon Vuplus
 
 Package: xbmc-pvr-vdr-vnsi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Addon VDR Vnsi
  This package contains the VDR Vnsi PVR (Personal Video Recorder) Addon for
  XBMC, the award winning free and open source software media-player and
@@ -42,7 +42,7 @@ Description: VDR-Network-Streaming-Interface
 
 Package: xbmc-pvr-njoy
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Addon Njoy
  This package contains the Njoy PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and
@@ -50,7 +50,7 @@ Description: XBMC PVR Addon Njoy
 
 Package: xbmc-pvr-nextpvr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Addon NextPvr
  This package contains the NextPvr PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment
@@ -58,7 +58,7 @@ Description: XBMC PVR Addon NextPvr
 
 Package: xbmc-pvr-mediaportal-tvserver
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Addon Mediaportal Tvserver
  This package contains the Mediaportal PVR (Personal Video Recorder) Addon for
  XBMC, the award winning free and open source software media-player and
@@ -66,7 +66,7 @@ Description: XBMC PVR Addon Mediaportal Tvserver
 
 Package: xbmc-pvr-tvheadend-hts
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Addon TvHeadend Hts
  This package contains the TvHeadend PVR (Personal Video Recorder) Addon for
  XBMC, the award winning free and open source software media-player and
@@ -74,7 +74,7 @@ Description: XBMC PVR Addon TvHeadend Hts
 
 # Package: xbmc-pvr-dvbviewer
 # Architecture: any
-# Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+# Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 # Description: XBMC PVR Addon Dvbviewer
 #  This package contains the Dvbviewer PVR (Personal Video Recorder) Addon for
 #  XBMC, the award winning free and open source software media-player and
@@ -82,7 +82,7 @@ Description: XBMC PVR Addon TvHeadend Hts
 
 Package: xbmc-pvr-argustv
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Addon Argustv
  This package contains the Argustv PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment
@@ -90,7 +90,7 @@ Description: XBMC PVR Addon Argustv
 
 Package: xbmc-pvr-demo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Demo Addon
  This package contains the Demo PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment
@@ -98,7 +98,7 @@ Description: XBMC PVR Demo Addon
 
 Package: xbmc-pvr-iptvsimple
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xbmc (>= 2:12)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
 Description: XBMC PVR Iptv Addon
  This package contains the Iptv PVR (Personal Video Recorder) Addon for XBMC,
  the award winning free and open source software media-player and entertainment
diff --git a/debian/rules b/debian/rules
index 86a5ae9..081e8a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,9 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS +=-I/usr/include/libavcodec
-CPPFLAGS +=-I/usr/include/libavcodec
+CFLAGS +=-I/usr/include/libavcodec -I/usr/include/xbmc
+CPPFLAGS +=-I/usr/include/libavcodec -I/usr/include/xbmc
+XBMC_VERSION= $(shell dpkg-query -W -f='${Version}\n' xbmc-addons-dev)
 
 %:
 	dh $@ --parallel
@@ -33,7 +34,8 @@ override_dh_clean:
 
 override_dh_auto_configure:
 	rm lib/tinyxml/tiny*
-	rm xbmc/avcodec.h
+	rm -rf xbmc
+	echo "xbmc-addons-abi:Depends=xbmc (>= $(XBMC_VERSION))" > debian/substvars
 	./bootstrap
 	./configure --prefix=/usr --enable-addons-with-dependencies --enable-release
 

-- 
xbmc-pvr-addons packaging