diff -u tomboy-0.15.5/debian/changelog tomboy-0.15.5/debian/changelog
--- tomboy-0.15.5/debian/changelog
+++ tomboy-0.15.5/debian/changelog
@@ -1,3 +1,9 @@
+tomboy (0.15.5-0ubuntu3) karmic; urgency=low
+
+  * Added patch to make ubuntuone.com the default sync server (LP: 416865)
+
+ -- Rodrigo Moya <rodrigo.moya@canonical.com>  Mon, 24 Aug 2009 14:01:30 +0200
+
 tomboy (0.15.5-0ubuntu2) karmic; urgency=low
 
   * Added patch to make REST syncing interface work with Ubuntu One server
diff -u tomboy-0.15.5/debian/patches/series tomboy-0.15.5/debian/patches/series
--- tomboy-0.15.5/debian/patches/series
+++ tomboy-0.15.5/debian/patches/series
@@ -2,0 +3 @@
+03_u1_as_default_sync.patch
only in patch2:
unchanged:
--- tomboy-0.15.5.orig/debian/patches/03_u1_as_default_sync.patch
+++ tomboy-0.15.5/debian/patches/03_u1_as_default_sync.patch
@@ -0,0 +1,13 @@
+diff --git a/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs b/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
+index 366c2dd..fca220a 100644
+--- a/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
++++ b/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
+@@ -93,6 +93,8 @@ namespace Tomboy.WebSync
+ 			string serverPref;
+ 			Api.OAuth oauth;
+ 			GetConfigSettings (out oauth, out serverPref);
++			if (string.IsNullOrEmpty (serverPref))
++				serverPref = "http://www.ubuntuone.com/notes";
+ 			prefsWidget = new WebSyncPreferencesWidget (oauth, serverPref);
+ 			return prefsWidget;
+ 		}