=== modified file 'debian/changelog'
--- debian/changelog	2009-02-25 08:16:58 +0000
+++ debian/changelog	2009-04-17 12:49:23 +0000
@@ -1,3 +1,10 @@
+conduit (0.3.15-1ubuntu3) jaunty; urgency=low
+
+  * debian/patches/07-python-2.6-network.dpatch
+   - From upstream: fix high CPU usage (LP: #362643)
+
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Fri, 17 Apr 2009 14:47:54 +0200
+
 conduit (0.3.15-1ubuntu2) jaunty; urgency=low
 
   * New bugfix revision (LP: #334087)

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2009-02-25 08:16:58 +0000
+++ debian/patches/00list	2009-04-17 12:48:41 +0000
@@ -4,3 +4,4 @@
 03_gio.dpatch
 05-display-help.dpatch
 06-non-ASCII-folder-canvas.dpatch
+07-python-2.6-network.dpatch

=== added file 'debian/patches/07-python-2.6-network.dpatch'
--- debian/patches/07-python-2.6-network.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/07-python-2.6-network.dpatch	2009-04-17 12:47:29 +0000
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-python-2.6-network.dpatch by  <julien.lavergne@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## Fix 50% CPU usage.
+## Ubuntu: https://bugs.launchpad.net/ubuntu/+source/conduit/+bug/362643
+## Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=558473
+## Upstream fixes : d3edac178ec3c2c963f7faf2a590accbea35160a and ede6cc86ede22ec45480c51cea2825a9b48456fd
+
+@DPATCH@
+diff -urNad conduit.362643~/conduit/modules/NetworkModule/XMLRPCUtils.py conduit.362643/conduit/modules/NetworkModule/XMLRPCUtils.py
+--- conduit.362643~/conduit/modules/NetworkModule/XMLRPCUtils.py	2009-04-17 14:38:19.000000000 +0200
++++ conduit.362643/conduit/modules/NetworkModule/XMLRPCUtils.py	2009-04-17 14:43:54.000000000 +0200
+@@ -12,6 +12,7 @@
+ import xmlrpclib
+ import SimpleXMLRPCServer
+ import logging
++import time
+ 
+ #One log for the client
+ clog = logging.getLogger("modules.Network.C")
+@@ -78,6 +79,7 @@
+     def serve(self):
+         self.socket.setblocking(0)
+         while not self.closed:
++            time.sleep(0.15)
+             self.handle_request()        
+             
+     def get_request(self):