[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.4.0-2-12-g494eda6

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 9e1d4c410781ef7105031381ef4bda94466e7e8c
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Jun 1 06:20:01 2012 +0800

    Use multiarch libdir

diff --git a/debian/banshee-meego.install b/debian/banshee-meego.install
index 20c7c62..f83dd3a 100644
--- a/debian/banshee-meego.install
+++ b/debian/banshee-meego.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/banshee/MeeGo.exe
-debian/tmp/usr/lib/banshee/Extensions/Banshee.MeeGo.dll*
+debian/tmp/usr/lib/*/banshee/MeeGo.exe
+debian/tmp/usr/lib/*/banshee/Extensions/Banshee.MeeGo.dll*
 debian/tmp/usr/share/mutter-meego
 debian/tmp/usr/share/dbus-1/services/com.meego*
diff --git a/debian/banshee.install b/debian/banshee.install
index 8f57e92..a598ac7 100644
--- a/debian/banshee.install
+++ b/debian/banshee.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/banshee/
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/banshee/
 debian/banshee.xpm /usr/share/pixmaps
 debian/source_banshee.py usr/share/apport/package-hooks
diff --git a/debian/rules b/debian/rules
index 6b9616d..ef6c9a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,13 +77,13 @@ override_dh_install:
 	dh_install
 	# Remove MeeGo stuff from banshee binary package
 	rm -r debian/banshee/usr/share/mutter-meego/ \
-	      debian/banshee/usr/lib/banshee/MeeGo.exe \
-	      debian/banshee/usr/lib/banshee/Extensions/Banshee.MeeGo.dll* \
+	      debian/banshee/usr/lib/*/banshee/MeeGo.exe \
+	      debian/banshee/usr/lib/*/banshee/Extensions/Banshee.MeeGo.dll* \
 	      debian/banshee/usr/share/dbus-1/services/com.meego*
 ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 	# Remove U1MS and Sound Menu stuff from banshee
-	rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.* \
-	      debian/banshee/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
+	rm -r debian/banshee/usr/lib/*/banshee/Extensions/Banshee.SoundMenu.* \
+	      debian/banshee/usr/lib/*/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
 	cd po; intltool-update --pot
 
 	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \

-- 
banshee