diff -u sugar-toolkit-0.82.0/debian/control sugar-toolkit-0.82.0/debian/control
--- sugar-toolkit-0.82.0/debian/control
+++ sugar-toolkit-0.82.0/debian/control
@@ -1,8 +1,8 @@
 Source: sugar-toolkit
 Section: python
 Priority: optional
-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr@jones.dk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Build-Depends: cdbs (>= 0.4.39), autotools-dev, quilt, patchutils (>= 0.2.25), devscripts (>= 2.10.7), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, libxml-parser-perl, chrpath
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-toolkit.git
diff -u sugar-toolkit-0.82.0/debian/changelog sugar-toolkit-0.82.0/debian/changelog
--- sugar-toolkit-0.82.0/debian/changelog
+++ sugar-toolkit-0.82.0/debian/changelog
@@ -1,3 +1,9 @@
+sugar-toolkit (0.82.0-1ubuntu1) intrepid; urgency=low
+
+  * Patch to unset default jabber server (LP: #284876)
+
+ -- Morgan Collett <morgan@ubuntu.com>  Fri, 17 Oct 2008 16:44:18 +0200
+
 sugar-toolkit (0.82.0-1) unstable; urgency=low
 
   * New upstream release.
diff -u sugar-toolkit-0.82.0/debian/patches/series sugar-toolkit-0.82.0/debian/patches/series
--- sugar-toolkit-0.82.0/debian/patches/series
+++ sugar-toolkit-0.82.0/debian/patches/series
@@ -1,3 +1,5 @@
+0001_set_empty_jabber_server.patch
+0002_allow_setting_empty_jabber_server.patch
 1001_danish_l10n.patch
 1002_fix_xsmp_implicit_pointer_conversion.patch
 1003_avoid_try-except-finally.patch
only in patch2:
unchanged:
--- sugar-toolkit-0.82.0.orig/debian/patches/0001_set_empty_jabber_server.patch
+++ sugar-toolkit-0.82.0/debian/patches/0001_set_empty_jabber_server.patch
@@ -0,0 +1,20 @@
+commit c706329fb4e9da1c7188e2de0c464c17bbce5c47
+Author: Marco Pesenti Gritti <mpgritti@gmail.com>
+Date:   Thu Sep 11 10:51:59 2008 +0200
+
+    Default to empty jabber server. Patch by gdesmott with minor change by me.
+    Fix #8354
+
+diff --git a/src/sugar/profile.py b/src/sugar/profile.py
+index 25b957e..0d7e98d 100644
+--- a/src/sugar/profile.py
++++ b/src/sugar/profile.py
+@@ -24,7 +24,7 @@ from sugar import env
+ from sugar import util
+ from sugar.graphics.xocolor import XoColor
+ 
+-DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk'
++DEFAULT_JABBER_SERVER = ''
+ DEFAULT_VOLUME = 81
+ DEFAULT_TIMEZONE = 'UTC'
+ DEFAULT_HOT_CORNERS_DELAY = 0.0
only in patch2:
unchanged:
--- sugar-toolkit-0.82.0.orig/debian/patches/0002_allow_setting_empty_jabber_server.patch
+++ sugar-toolkit-0.82.0/debian/patches/0002_allow_setting_empty_jabber_server.patch
@@ -0,0 +1,21 @@
+commit 5821dc3d17f9a703fc4fe752b71ce507d1ddf639
+Author: Simon Schampijer <simon@schampijer.de>
+Date:   Thu Sep 18 23:19:55 2008 +0200
+
+    Allow setting empty jabber server (2)
+    
+    fix #8354 completely
+
+diff --git a/src/sugar/profile.py b/src/sugar/profile.py
+index 0d7e98d..1b08202 100644
+--- a/src/sugar/profile.py
++++ b/src/sugar/profile.py
+@@ -104,7 +104,7 @@ class Profile(object):
+             _set_key(cp, 'Buddy', 'Color', self.color.to_string())
+         if self.backup1:
+             _set_key(cp, 'Server', 'Backup1', self.backup1)
+-        if self.jabber_server:
++        if self.jabber_server is not None:
+             _set_key(cp, 'Jabber', 'Server', self.jabber_server)
+ 
+         _set_key(cp, 'Date', 'Timezone', self.timezone)