[SCM] muon packaging branch, kubuntu_unstable, updated. dba38d059cff6690eeb004c6f16d34d21a28f719

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=dba38d0

The following commit has been merged in the kubuntu_unstable branch:
commit dba38d059cff6690eeb004c6f16d34d21a28f719
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 13 13:17:08 2015 +0100

    fix dh_makeshlibs and not-installed
    
    makeshlibs exclude actually doesn't like wildcards, so make it specific
    
    not-installed has the same problem
---
 debian/not-installed | 4 +++-
 debian/rules         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/not-installed b/debian/not-installed
index 957ea5d..999a4ba 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1,3 @@
-usr/lib/*/libmuonprivate.so
+./usr/bin/muon-exporter
+./usr/lib/i386-linux-gnu/libmuonprivate.so
+./usr/lib/x86_64-linux-gnu/libmuonprivate.so
diff --git a/debian/rules b/debian/rules
index 70f44ef..70c635e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 override_dh_strip:
 	$(overridden_command) --dbg-package=muon-dbg
 
@@ -12,7 +14,7 @@ override_dh_strip:
 # 'backend' which makes for bogus, pointless, silly shlibs entries.
 # Couldn't be bothered to report this - sitter, 2015
 override_dh_makeshlibs:
-	$(overridden_command) -Xusr/lib/*/qt5/plugins/muon* -V
+	$(overridden_command) -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/muon* -V
 
 # FIXME: tests are broken at this time
 .PHONY: override_dh_auto_test

-- 
muon packaging