[SCM] ffado/master: Update changelog and control.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 908a5b831f982a00f274c3df47aaee9ba34b8b08
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 15 22:35:53 2012 +0200

    Update changelog and control.

diff --git a/debian/changelog b/debian/changelog
index 515ba07..f8f9134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libffado (2.0.99+svn2163-2) UNRELEASED; urgency=low
+
+  * Build-depend explicitly on libdbus-c++-bin.
+    See bug#674311 (comment#15). Thanks to Vincent Cheng.
+  * Remove debian/source/local-options: abort-on-upstream-changes and
+    unapply-patches are default in dpkg-source since 1.16.1.
+  * Really let libffado Break too old jackd{1,2}-firewire.
+    Closes: bug#670985.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 15 Jun 2012 22:32:36 +0200
+
 libffado (2.0.99+svn2163-1) unstable; urgency=low
 
   * Ship upstream udev file
diff --git a/debian/control b/debian/control
index c05ec7c..5e2b494 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
  libconfig++-dev,
  libdbus-1-dev,
  libdbus-c++-dev,
+ libdbus-c++-bin,
  libexpat1-dev,
  libiec61883-dev (>= 1.1.0),
  libraw1394-dev (>= 1.3.0),
@@ -76,7 +77,9 @@ Depends:
 Replaces:
  ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
 Breaks:
- ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
+ 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)
 Description: FFADO debugging and firmware tools
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .

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