rev 6789 - in trunk/packages/kdenetwork/debian: . patches

[Sarah Hobbs]

Author: hobbsee-guest
Date: 2007-07-20 15:46:22 +0000 (Fri, 20 Jul 2007)
New Revision: 6789

Added:
   trunk/packages/kdenetwork/debian/patches/21_fix_krfb_crash.diff
   trunk/packages/kdenetwork/debian/patches/22_kppp_nozomi.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
Log:
Merge from kubuntu

Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2007-07-20 13:51:21 UTC (rev 6788)
+++ trunk/packages/kdenetwork/debian/changelog	2007-07-20 15:46:22 UTC (rev 6789)
@@ -1,3 +1,11 @@
+kdenetwork (4:3.5.7-3) unstable; urgency=low
+
+  * Pull patch from upstream to make krfb work. (Closes KDE #124529)
+  * Pull patch from Ubuntu to support nozomi devices.  
+    Thanks to Stephan Hermann <sh at sourcecode.de> for this patch
+
+ -- Sarah Hobbs <hobbsee at ubuntu.com>  Sat, 21 Jul 2007 01:32:45 +1000
+
 kdenetwork (4:3.5.7-2) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:

Added: trunk/packages/kdenetwork/debian/patches/21_fix_krfb_crash.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/21_fix_krfb_crash.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/21_fix_krfb_crash.diff	2007-07-20 15:46:22 UTC (rev 6789)
@@ -0,0 +1,11 @@
+--- kdenetwork/krfb/libvncserver/main.c	2006-03-17 11:12:23.000000000 +0100 KDE BUG #124529
++++ kdenetwork/krfb/libvncserver/main.c	2007-06-29 15:46:06.000000000 +0200
+@@ -260,6 +260,7 @@ clientOutput(void *data)
+ 	    UNLOCK(cl->updateMutex);
+ 
+             if (!haveUpdate) {
++		LOCK(cl->updateMutex);
+                 TIMEDWAIT(cl->updateCond, cl->updateMutex, PING_MS);
+ 		UNLOCK(cl->updateMutex); /* we really needn't lock now. */
+ 		if (!haveUpdate)
+

Added: trunk/packages/kdenetwork/debian/patches/22_kppp_nozomi.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/22_kppp_nozomi.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/22_kppp_nozomi.diff	2007-07-20 15:46:22 UTC (rev 6789)
@@ -0,0 +1,14 @@
+diff -Nur kdenetwork-3.5.6/kppp/devices.h kdenetwork-3.5.6.new/kppp/devices.h
+--- kdenetwork-3.5.6/kppp/devices.h	2007-01-26 19:48:23.605731343 +0100
++++ kdenetwork-3.5.6.new/kppp/devices.h	2007-01-26 19:49:52.530798893 +0100
+@@ -59,6 +59,10 @@
+   "/dev/ttyS15",
+   "/dev/ttyS16",
+   "/dev/ttyS17",
++  "/dev/noz0",
++  "/dev/noz1",
++  "/dev/noz2",
++  "/dev/noz3",
+   "/dev/ttyACM0",
+   "/dev/ttyACM1",
+   "/dev/ttyACM2",