diff -u qjackctl-0.3.4/debian/control qjackctl-0.3.4/debian/control
--- qjackctl-0.3.4/debian/control
+++ qjackctl-0.3.4/debian/control
@@ -8,7 +8,7 @@
 
 Package: qjackctl
 Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}, jackd (>= 0.118)
+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 -u qjackctl-0.3.4/debian/changelog qjackctl-0.3.4/debian/changelog
--- qjackctl-0.3.4/debian/changelog
+++ qjackctl-0.3.4/debian/changelog
@@ -1,3 +1,13 @@
+qjackctl (0.3.4-0ubuntu4.1) lucid-proposed; urgency=low
+
+  * 04_fix-source-port-renames.patch: Cherry-pick relevant hunk from
+    upstream svn revision 542 to fix source port renames (LP: #490436)
+  * debian/control: Fix lintian error:
+    E: qjackctl source: missing-separator-between-items in qjackctl
+    depends field between '${shlibs:Depends}' and '${misc:Depends}'
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Sun, 25 Jul 2010 16:45:42 -0400
+
 qjackctl (0.3.4-0ubuntu4) lucid; urgency=low
 
   * Comply with jackd >= 0.118.0 which now runs in real-time mode by
only in patch2:
unchanged:
--- qjackctl-0.3.4.orig/debian/patches/04_fix-source-port-renames.patch
+++ qjackctl-0.3.4/debian/patches/04_fix-source-port-renames.patch
@@ -0,0 +1,13 @@
+Index: src/qjackctlJackConnect.cpp
+===================================================================
+--- ./src/qjackctlJackConnect.cpp	(revision 541)
++++ ./src/qjackctlJackConnect.cpp	(revision 542)
+@@ -228,7 +228,7 @@
+ 				QString sPortName   = sClientPort.right(sClientPort.length() - iColon - 1);
+ 				pClient = static_cast<qjackctlJackClient *> (findClient(sClientName));
+ 				if (pClient)
+-					pPort = pClient->findJackPort(pJackPort);
++					pPort = static_cast<qjackctlJackPort *> (pClient->findPort(sPortName));
+ 				if (pClient == 0) {
+ 					pClient = new qjackctlJackClient(this, sClientName);
+ 					iDirtyCount++;