[SCM] qxgedit/master: Make libdir multiarch.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6885e77b9f3b924b7d2810d11204129eb4766af6
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed May 13 23:40:52 2015 +0200

    Make libdir multiarch.

diff --git a/debian/patches/0002-fix_multiarch_dir.patch b/debian/patches/0002-fix_multiarch_dir.patch
new file mode 100644
index 0000000..955d4e7
--- /dev/null
+++ b/debian/patches/0002-fix_multiarch_dir.patch
@@ -0,0 +1,21 @@
+Description:  Make libdir multiarch.
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+
+Index: qxgedit/skulpture/skulpture.pro
+===================================================================
+--- qxgedit.orig/skulpture/skulpture.pro
++++ qxgedit/skulpture/skulpture.pro
+@@ -35,9 +35,9 @@ unix {
+ 
+ 	TARGET_ARCH = $$system(uname -m)
+ 	contains(TARGET_ARCH, x86_64) {
+-		TARGET_PREFIX = $${PREFIX}/lib64
++		TARGET_PREFIX = $${PREFIX}/lib/$(DEB_HOST_MULTIARCH)
+ 	} else {
+-		TARGET_PREFIX = $${PREFIX}/lib
++		TARGET_PREFIX = $${PREFIX}/lib/$(DEB_HOST_MULTIARCH)
+ 	}
+ 
+ 	lessThan(QT_MAJOR_VERSION, 5) {
diff --git a/debian/patches/series b/debian/patches/series
index 72754b0..c1ff7d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-desktop.patch
+0002-fix_multiarch_dir.patch
diff --git a/debian/rules b/debian/rules
index 874867b..1ec4ccc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --parallel --with autoreconf

-- 
qxgedit packaging