[SCM] qjackctl/master: Apply settings patch for Ubuntu (Closes: #678449)

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

The following commit has been merged in the master branch:
commit 696b3f87df280c6727a01f929a408580b603df93
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Jun 22 00:53:23 2012 +0200

    Apply settings patch for Ubuntu (Closes: #678449)

diff --git a/debian/patches/00_settings.patch b/debian/patches/00_settings.patch
index 31ef830..7c851c5 100644
--- a/debian/patches/00_settings.patch
+++ b/debian/patches/00_settings.patch
@@ -1,22 +1,24 @@
 Description: Apply Debian-specific patches.
+  This patch was modified from the original debian patch. 
+  It changes the default jackd patch to /usr/bin/jackd.
+  In addition, the preset sample rate is 44100.
 Origin: Debian
+Author: Chris J Arges <chris.j.arges at canonical.com>
 Forwarded: not-needed
----
- src/qjackctlSetup.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+Last-Update: <2012-06-21>
 
---- qjackctl.orig/src/qjackctlSetup.cpp
-+++ qjackctl/src/qjackctlSetup.cpp
-@@ -343,7 +343,7 @@ bool qjackctlSetup::loadPreset ( qjackct
+--- qjackctl-0.3.9.orig/src/qjackctlSetup.cpp
++++ qjackctl-0.3.9/src/qjackctlSetup.cpp
+@@ -345,7 +345,7 @@ bool qjackctlSetup::loadPreset ( qjackct
  	}
  
  	m_settings.beginGroup("/Settings" + sSuffix);
--	preset.sServer      = m_settings.value("/Server", "jackd").toString();
-+	preset.sServer      = m_settings.value("/Server", "/usr/bin/jackd").toString();
+-	preset.sServerPrefix = m_settings.value("/Server", "jackd").toString();
++	preset.sServerPrefix = m_settings.value("/Server", "/usr/bin/jackd").toString();
  	preset.sServerName  = m_settings.value("/ServerName").toString();
  	preset.bRealtime    = m_settings.value("/Realtime", true).toBool();
  	preset.bSoftMode    = m_settings.value("/SoftMode", false).toBool();
-@@ -356,7 +356,7 @@ bool qjackctlSetup::loadPreset ( qjackct
+@@ -358,7 +358,7 @@ bool qjackctlSetup::loadPreset ( qjackct
  	preset.bIgnoreHW    = m_settings.value("/IgnoreHW", false).toBool();
  	preset.iPriority    = m_settings.value("/Priority", 0).toInt();
  	preset.iFrames      = m_settings.value("/Frames", 1024).toInt();

-- 
qjackctl packaging