[SCM] Phonon VLC backend packaging branch, master, updated. debian/0.6.2-2-7-g01386af

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-vlc.git;a=commitdiff;h=14527da

The following commit has been merged in the master branch:
commit 14527da9e6e747c18e28fd0d9fe53c63730a3bd4
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 18 17:18:47 2013 +0200

    install the plugin in a multiarch location
---
 debian/changelog                  |    2 ++
 debian/phonon-backend-vlc.install |    2 +-
 debian/rules                      |    4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c40d210..5310f60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ phonon-backend-vlc (0.6.2-3) UNRELEASED; urgency=low
     - bump the debhelper build dependency to >= 9
   * Update Vcs-* headers.
   * Fix watch file.
+  * Convert to multiarch:
+    - install the plugin in a multiarch location
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Aug 2013 16:52:03 +0200
 
diff --git a/debian/phonon-backend-vlc.install b/debian/phonon-backend-vlc.install
index a31c554..40783aa 100644
--- a/debian/phonon-backend-vlc.install
+++ b/debian/phonon-backend-vlc.install
@@ -1,2 +1,2 @@
-usr/lib/qt4/plugins/phonon_backend/phonon_vlc.so
+usr/lib/*/qt4/plugins/phonon_backend/phonon_vlc.so
 usr/share/kde4/services/phononbackends/vlc.desktop
diff --git a/debian/rules b/debian/rules
index a6ed78d..a26e942 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,14 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
+	$(overridden_command) -- -DPLUGIN_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=phonon-backend-vlc-dbg

-- 
Phonon VLC backend packaging