[SCM] ffado/master: Move the ffado-debug binary from libffado2 to the ffado-tools package

[mattia at users.alioth.debian.org]

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

    Move the ffado-debug binary from libffado2 to the ffado-tools package
    
    This will make possible to mark libffado2 as Multi-Arch:same.
    A future update should probably also move the debug-enabled library to a
    separate package.  Or fix whatever was the cause requiring both variants
    to be built and shipped.
    
    Gbp-Dch: Short
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/control b/debian/control
index b47137e..d33f5b0 100644
--- a/debian/control
+++ b/debian/control
@@ -75,10 +75,12 @@ Depends:
  ${shlibs:Depends},
 Replaces:
  ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
+ libffado2 (<< 2.3.0-3),
 Breaks:
  ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
  jackd1-firewire (<< 1:0.121.3+20120418git75e3e20b-1),
  jackd2-firewire (<< 1.9.8~dfsg.3+20120418gitf82ec715-1),
+ libffado2 (<< 2.3.0-3),
 Description: FFADO debugging and firmware tools
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -94,6 +96,7 @@ Description: FFADO debugging and firmware tools
      * ffado-bridgeco-downloader
      * ffado-test
      * ffado-fireworks-downloader
+     * ffado-debug
 
 Package: ffado-dbus-server
 Section: sound
diff --git a/debian/ffado-tools.install b/debian/ffado-tools.install
index 807aca8..0a304a0 100644
--- a/debian/ffado-tools.install
+++ b/debian/ffado-tools.install
@@ -1,3 +1,4 @@
+debian/ffado-debug usr/bin/
 debian/tmp/usr/bin/ffado-bridgeco-downloader
 debian/tmp/usr/bin/ffado-diag
 debian/tmp/usr/bin/ffado-fireworks-downloader
diff --git a/debian/libffado2.install b/debian/libffado2.install
index a5cf2d3..97d4075 100755
--- a/debian/libffado2.install
+++ b/debian/libffado2.install
@@ -1,5 +1,4 @@
 #!/usr/bin/dh-exec
-debian/ffado-debug usr/bin/
 debian/tmp/dbg/usr/lib/*/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}/libffado2/
 debian/tmp/lib/udev
 debian/tmp/usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 208237e..74253b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,12 +82,10 @@ 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
 
 binary-install/ffado-tools::
+	sed -i 's/@@MULTIARCH@@/$(DEB_HOST_MULTIARCH)/' debian/ffado-tools/usr/bin/ffado-debug
 	find debian/ffado-tools -type f -name "static_info.txt" -delete
 	dh_python2 -pffado-tools

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