[SCM] kodi/master: Convert to package to use multiarch library dirs

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 79ad90dfec690dd170379386e4addee83962c49e
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Sep 3 12:57:49 2015 +0200

    Convert to package to use multiarch library dirs

diff --git a/debian/control b/debian/control
index 3dee2d8..cd4445c 100644
--- a/debian/control
+++ b/debian/control
@@ -118,6 +118,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/kodi.git
 
 Package: kodi
 Architecture: all
+Multi-Arch: foreign
 Depends: kodi-bin (>= ${source:Version}),
          kodi-bin (<< ${source:Version}.1~),
          mesa-utils,
@@ -155,6 +156,8 @@ Description: Open Source Home Theatre (arch-independent data package)
 
 Package: kodi-bin
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${dlopenlibs:Depends},
          ${misc:Depends}
@@ -210,6 +213,7 @@ Description: Open Source Home Theatre - debug symbols
 
 Package: kodi-eventclients-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${python:Depends}, ${misc:Depends}
 Description: Open Source Home Theatre (Event Client Common package)
  Kodi, formerly known as XBMC is an award winning free and
@@ -233,6 +237,7 @@ Description: Open Source Home Theatre (Event Client Common package)
 
 Package: kodi-eventclients-dev
 Architecture: all
+Multi-Arch: foreign
 Section: libdevel
 Depends: kodi-eventclients-common (= ${binary:Version}),
          ${misc:Depends}
@@ -310,6 +315,7 @@ Description: Open Source Home Theatre (Event Client J2ME package)
 
 Package: kodi-eventclients-ps3
 Architecture: all
+Multi-Arch: foreign
 Depends: kodi-eventclients-common (= ${binary:Version}),
          python-bluez | python-lightblue,
          ${python:Depends},
@@ -361,6 +367,7 @@ Description: Open Source Home Theatre (Event Client Kodi-SEND package)
 
 Package: kodi-addons-dev
 Architecture: all
+Multi-Arch: foreign
 Section: libdevel
 Depends: ${misc:Depends}
 Description: Open Source Home Theatre (Addons Dev package)
diff --git a/debian/kodi-bin.install b/debian/kodi-bin.install
index d8adb8a..fe61f1c 100644
--- a/debian/kodi-bin.install
+++ b/debian/kodi-bin.install
@@ -1,2 +1 @@
-usr/lib/kodi
-../../tools/depends/native/TexturePacker/bin/TexturePacker /usr/lib/kodi
+usr/lib/*/kodi
diff --git a/debian/rules b/debian/rules
index d22fcc8..a709eae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 GL_CONFIG_OPTIONS = --enable-gl --disable-gles --enable-vdpau
 ARCH_SPECIFIC_LIB_RECOMMENDS_ADD = -lvdpau
 
@@ -109,6 +111,8 @@ override_dh_auto_configure: configure
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	install -m 755 $(CURDIR)/tools/depends/native/TexturePacker/bin/TexturePacker \
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/kodi/
 	$(MAKE) eventclients DESTDIR=$(CURDIR)/debian/tmp \
 		WII_EXTRA_OPTS=-DCWIID_OLD
 
@@ -123,12 +127,12 @@ override_dh_makeshlibs:
 	# We don't install shared libraries in standard locations so don't run
 	# dh_makeshlibs
 	# OTOH we need to remove exec flag after dh_strip
-	chmod -x $(CURDIR)/debian/tmp/usr/lib/kodi/addons/visualization.*/*.vis
-	-chmod -x $(CURDIR)/debian/tmp/usr/lib/kodi/addons/screensaver.rsxs.*/*.xbs
+	chmod -x $(CURDIR)/debian/tmp/usr/lib/*/kodi/addons/visualization.*/*.vis
+	-chmod -x $(CURDIR)/debian/tmp/usr/lib/*/kodi/addons/screensaver.rsxs.*/*.xbs
 
 override_dh_shlibdeps: debian/tmp/kodi-bin-depends-dummy.so debian/tmp/kodi-bin-recommends-dummy.so
 	dh_shlibdeps -a -O--parallel \
-		-l$(CURDIR)/debian/kodi-bin/usr/lib/kodi/system/players/dvdplayer
+		-l$(CURDIR)/debian/kodi-bin/usr/lib/*/kodi/system/players/dvdplayer
 	# Need to manually add dependencies for dlopened libs.
 	dpkg-shlibdeps -pdlopenlibs -edebian/tmp/kodi-bin-depends-dummy.so -xlibc6 -O >>debian/kodi-bin.substvars
 	dpkg-shlibdeps -dRecommends -edebian/tmp/kodi-bin-recommends-dummy.so -xlibc6 -O >>debian/kodi-bin.substvars

-- 
kodi packaging