Merge lp:~rodrigo-moya/ubuntu/maverick/tomboy/add-u1-note into lp:~ubuntu-desktop/tomboy/ubuntu

[Rodrigo Moya]

Add patch to have a Ubuntu One information note

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-11 15:53:51 +0000
+++ debian/changelog	2010-08-11 16:12:46 +0000
@@ -1,3 +1,11 @@
+tomboy (1.3.1-1ubuntu2) maverick; urgency=low
+
+  * debian/patches/05_add_start_u1_note.patch:
+    - Add patch to have a Ubuntu One information note on new installations
+      (LP: #615876)
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 11 Aug 2010 18:00:34 +0200
+
 tomboy (1.3.1-1ubuntu1b1) maverick; urgency=low
 
   * No-change upload to rebuild against current debhelper, to drop sizable

=== added file 'debian/patches/05_add_start_u1_note.patch'
--- debian/patches/05_add_start_u1_note.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_add_start_u1_note.patch	2010-08-11 16:12:46 +0000
@@ -0,0 +1,38 @@
+diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
+index be9f6d8..aa765bf 100644
+--- a/Tomboy/NoteManager.cs
++++ b/Tomboy/NoteManager.cs
+@@ -294,6 +294,23 @@ Ciao!");
+ 			                           "Also, if you type the name of another note in your " +
+ 			                           "current note, it will automatically be linked for you." +
+ 			                           "</note-content>");
++			string u1_note_content =
++				Catalog.GetString ("<note-content>" +
++						   "<bold>Tomboy is better with Ubuntu One</bold> - " +
++						   "the personal cloud that brings your digital life together.\n\n" +
++						   "Ubuntu One does more than sync your files - whether you need " +
++						   "to access your contacts, notes or bookmarks from any computer or " +
++						   "the web, enjoy your favorite music from a cloud integrated store " +
++						   "or stream your entire collection to iPhone and Android mobile phones " +
++						   "- we’ve raised the bar on personal clouds. Learn more at " +
++						   "<link:url>http://one.ubuntu.com/</link:url>.\n\n" +
++						   "Already have an Ubuntu One account? Setup Tomboy to sync with your " +
++						   "personal cloud by clicking Edit > Preferences and then the Synchronization "+
++						   "tab. Select \"Tomboy Web\" from the list of services and then click the "+
++						   "\"Connect to Server\" button. A web browser will appear with a few " +
++						   "additional instructions.\n\n" +
++						   "You can even enable automatic sync with Ubuntu One!" +
++						   "</note-content>");
+ 
+ 			try {
+ 				Note start_note = Create (Catalog.GetString ("Start Here"),
+@@ -305,6 +322,9 @@ Ciao!");
+ 				                          links_note_content);
+ 				links_note.QueueSave (ChangeType.ContentChanged);
+ 
++				Note u1_note = Create ("Ubuntu One", u1_note_content);
++				u1_note.QueueSave (ChangeType.ContentChanged);
++
+ 				if (!Tomboy.IsPanelApplet)
+ 					start_note.Window.Show ();
+ 			} catch (Exception e) {

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-11 15:53:51 +0000
+++ debian/patches/series	2010-08-11 16:12:46 +0000
@@ -1,6 +1,7 @@
 01_dllmaps.patch
 03_u1_as_default_sync.patch
 04_app_indicator.patch
+05_add_start_u1_note.patch
 10_disable_unit_tests
 11_lpi.patch
 20_remove_pcfile_requires