diff -Nru qjackctl-0.3.4/debian/changelog qjackctl-0.3.4/debian/changelog --- qjackctl-0.3.4/debian/changelog 2010-03-14 13:55:16.000000000 +0100 +++ qjackctl-0.3.4/debian/changelog 2010-03-14 13:55:17.000000000 +0100 @@ -1,3 +1,11 @@ +qjackctl (0.3.4-0ubuntu4) lucid; urgency=low + + * Comply with jackd >= 0.118.0 which now runs in real-time mode by + default, cherrypicked from upstream. Update debian/control to + require jackd >= 0.118. + + -- David Henningsson Sun, 14 Mar 2010 13:13:27 +0100 + qjackctl (0.3.4-0ubuntu3) lucid; urgency=low * No-change rebuild for jack transition. diff -Nru qjackctl-0.3.4/debian/control qjackctl-0.3.4/debian/control --- qjackctl-0.3.4/debian/control 2010-03-14 13:55:16.000000000 +0100 +++ qjackctl-0.3.4/debian/control 2010-03-14 13:55:17.000000000 +0100 @@ -8,7 +8,7 @@ Package: qjackctl Architecture: any -Depends: ${shlibs:Depends} ${misc:Depends}, jackd +Depends: ${shlibs:Depends} ${misc:Depends}, jackd (>= 0.118) Description: User interface for controlling the JACK sound server Qjackctl offers a user interface for controlling the JACK sound server daemon. At the same time it figures as a JACK patch bay and monitoring diff -Nru qjackctl-0.3.4/debian/patches/03_realtimedefault.patch qjackctl-0.3.4/debian/patches/03_realtimedefault.patch --- qjackctl-0.3.4/debian/patches/03_realtimedefault.patch 1970-01-01 01:00:00.000000000 +0100 +++ qjackctl-0.3.4/debian/patches/03_realtimedefault.patch 2010-03-14 13:55:17.000000000 +0100 @@ -0,0 +1,19 @@ +Description: Comply with jackd >= 0.118.0 which now runs in real-time mode by default +Origin: http://qjackctl.svn.sourceforge.net/viewvc/qjackctl/trunk/src/qjackctlMainForm.cpp?r1=576&r2=579 +Forwarded: not-needed +diff -Nur -x '*.orig' -x '*~' qjackctl-0.3.4/build-tree/qjackctl-0.3.4/src/qjackctlMainForm.cpp qjackctl-0.3.4.new/build-tree/qjackctl-0.3.4/src/qjackctlMainForm.cpp +--- qjackctl-0.3.4/src/qjackctlMainForm.cpp 2008-10-02 18:18:12.000000000 +0200 ++++ qjackctl-0.3.4/src/qjackctlMainForm.cpp 2010-03-14 13:02:07.412430975 +0100 +@@ -801,10 +801,11 @@ + if (m_preset.bVerbose) + args.append("-v"); + if (m_preset.bRealtime) { +- args.append("-R"); ++ // args.append("-R"); + if (m_preset.iPriority > 0 && !bCoreaudio) + args.append("-P" + QString::number(m_preset.iPriority)); + } ++ else args.append("-r"); + if (m_preset.iPortMax > 0 && m_preset.iPortMax != 256) + args.append("-p" + QString::number(m_preset.iPortMax)); + if (m_preset.iTimeout > 0 && m_preset.iTimeout != 500)