[SCM] qjackctl/master: On Ubuntu, enable DBus by default (LP: #803026).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fbb887fc53c170c6248164e080463cd79bc49f18
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jul 4 11:01:48 2011 +0200

    On Ubuntu, enable DBus by default (LP: #803026).

diff --git a/debian/patches/90_dbus_setting.patch b/debian/patches/90_dbus_setting.patch
new file mode 100644
index 0000000..9bf0415
--- /dev/null
+++ b/debian/patches/90_dbus_setting.patch
@@ -0,0 +1,18 @@
+Description: Enable dbus by default to ease cooperation between JACK and Pulse
+Author: David Henningsson <david.henningsson at canonical.com>
+Bug-Ubuntu: https://launchpad.net/bugs/803026
+---
+ src/qjackctlSetup.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- qjackctl.orig/src/qjackctlSetup.cpp
++++ qjackctl/src/qjackctlSetup.cpp
+@@ -107,7 +107,7 @@ void qjackctlSetup::loadSetup (void)
+ 	bServerConfigTemp        = m_settings.value("/ServerConfigTemp", false).toBool();
+ 	bQueryShutdown           = m_settings.value("/QueryShutdown", true).toBool();
+ 	bAlsaSeqEnabled          = m_settings.value("/AlsaSeqEnabled", true).toBool();
+-	bDBusEnabled             = m_settings.value("/DBusEnabled", false).toBool();
++	bDBusEnabled             = m_settings.value("/DBusEnabled", true).toBool();
+ 	bAliasesEnabled          = m_settings.value("/AliasesEnabled", false).toBool();
+ 	bAliasesEditing          = m_settings.value("/AliasesEditing", false).toBool();
+ 	bLeftButtons             = m_settings.value("/LeftButtons", true).toBool();
diff --git a/debian/patches/series b/debian/patches/ubuntu.series
similarity index 75%
copy from debian/patches/series
copy to debian/patches/ubuntu.series
index b658079..63a5d27 100644
--- a/debian/patches/series
+++ b/debian/patches/ubuntu.series
@@ -2,3 +2,4 @@
 10_errno.patch
 shutdown.patch
 desktop-crlf.patch
+90_dbus_setting.patch

-- 
qjackctl packaging