[SCM] ffado/master: Multiarchify the library installation:

[mattia at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a700b60c019b9c47c4135eae62b3212c95aab8e5
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Nov 11 00:27:00 2017 +0100

    Multiarchify the library installation:
    
    * Move all library files to a triplet-defined directory /usr/lib/<trplet>/
    * Change ffado-debug to load from that directory
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/control b/debian/control
index d5b44d5..b47137e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  cdbs,
  dbus (>= 1.0.0),
  debhelper (>= 10),
+ dh-exec,
  devscripts,
  dh-python,
  libconfig++-dev,
diff --git a/debian/ffado-debug b/debian/ffado-debug
index 1a3e91b..3fc21ec 100644
--- a/debian/ffado-debug
+++ b/debian/ffado-debug
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-export LD_LIBRARY_PATH=/usr/lib/libffado2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=/usr/lib/@@MULTIARCH@@/libffado2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 exec "$@"
diff --git a/debian/ffado-debug.1 b/debian/ffado-debug.1
index f893170..a55588e 100644
--- a/debian/ffado-debug.1
+++ b/debian/ffado-debug.1
@@ -1,4 +1,4 @@
-.TH FFADO "29" "October 2010" "2.0.1"
+.TH FFADO-DEBUG "1" "November 2017" "2.3.0"
 .SH NAME
 \fBffado-debug\fR \- Run FFADO in debug mode
 .SH SYNOPSYS
@@ -6,7 +6,11 @@
 .SH DESCRIPTION
 ffado-debug is a wrapper-script to make FFADO clients (e.g. jackd) use
 a debug-enabled version of the library. The script expect this library
-to reside in /usr/lib/libffado/ and prefixes LD_LIBRARY_PATH accordingly.
+to reside in
+.I /usr/lib/<multiarch-triplet>/libffado/
+and prefixes
+.B LD_LIBRARY_PATH
+accordingly.
 .SH EXAMPLES
 ffado-debug jackd -d firewire -v5
 .SH AUTHOR
diff --git a/debian/libffado-dev.install b/debian/libffado-dev.install
index fad5560..577d1c4 100644
--- a/debian/libffado-dev.install
+++ b/debian/libffado-dev.install
@@ -1,3 +1,3 @@
-#debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/*/lib*.so
 debian/tmp/usr/include/libffado/*
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/pkgconfig/*
diff --git a/debian/libffado-dev.links b/debian/libffado-dev.links
deleted file mode 100644
index ab53794..0000000
--- a/debian/libffado-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libffado.so.2 usr/lib/libffado.so
diff --git a/debian/libffado2.install b/debian/libffado2.install
old mode 100644
new mode 100755
index 898c36b..a5cf2d3
--- a/debian/libffado2.install
+++ b/debian/libffado2.install
@@ -1,5 +1,6 @@
+#!/usr/bin/dh-exec
 debian/ffado-debug usr/bin/
-debian/tmp/dbg/usr/lib/lib*.so.* usr/lib/libffado2/
-debian/tmp/lib/*
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/dbg/usr/lib/*/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}/libffado2/
+debian/tmp/lib/udev
+debian/tmp/usr/lib/*/lib*.so.*
 debian/tmp/usr/share/libffado2/configuration
diff --git a/debian/rules b/debian/rules
index d5fe5e7..208237e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ endif
 
 DEB_SCONS_EXTRA_FLAGS := \
 	PREFIX=/usr \
+	LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	SHAREDIR=/usr/share/libffado2/ \
 	PYPKGDIR=/usr/share/ffado-mixer-qt4/ \
 	WILL_DEAL_WITH_XDG_MYSELF=1 \
@@ -81,6 +82,9 @@ scons-clean::
 	-rm -rf config.log scache.conf .sconf_temp .sconsign.dblite cache
 	-rm -rf admin/*.pyc
 
+binary-install/libffado2::
+	sed -i 's/@@MULTIARCH@@/$(DEB_HOST_MULTIARCH)/' debian/libffado2/usr/bin/ffado-debug
+
 binary-install/ffado-mixer-qt4::
 	dh_python2 -pffado-mixer-qt4
 

-- 
Free Firewire Audio Drivers (ffado.org) packaging