[SCM] xbmc/master: Fix #include directive across installed headers

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 739c4b9ae640d5ce0effe52668120addedfeea6f
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed May 7 22:42:38 2014 +0200

    Fix #include directive across installed headers

diff --git a/debian/rules b/debian/rules
index cb63165..785e7a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,6 +125,11 @@ override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) eventclients DESTDIR=$(CURDIR)/debian/tmp \
 		WII_EXTRA_OPTS=-DCWIID_OLD
+	mkdir -p $(CURDIR)/debian/tmp/usr/include/xbmc
+	sed 's|../library.xbmc.addon/|xbmc/|' addons/library.xbmc.gui/libXBMC_gui.h > \
+		$(CURDIR)/debian/tmp/usr/include/xbmc/libXBMC_gui.h
+	sed 's|../library.xbmc.addon/|xbmc/|' addons/library.xbmc.pvr/libXBMC_pvr.h > \
+		$(CURDIR)/debian/tmp/usr/include/xbmc/libXBMC_pvr.h
 
 override_dh_install:
 	dh_install -XLICENCE -XLICENSE \
diff --git a/debian/xbmc-addons-dev.install b/debian/xbmc-addons-dev.install
index 728861b..9d65aca 100644
--- a/debian/xbmc-addons-dev.install
+++ b/debian/xbmc-addons-dev.install
@@ -1,5 +1,5 @@
 addons/library.xbmc.addon/libXBMC_addon.h usr/include/xbmc/
-addons/library.xbmc.gui/libXBMC_gui.h usr/include/xbmc/
-addons/library.xbmc.pvr/libXBMC_pvr.h usr/include/xbmc/
+usr/include/xbmc/libXBMC_gui.h
+usr/include/xbmc/libXBMC_pvr.h
 xbmc/addons/include/*.h usr/include/xbmc/
 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h usr/include/xbmc/

-- 
xbmc packaging