Ubuntu
tomboy package

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

  1. Maverick (10.10)
  2. add-u1-note
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 47
Proposed branch: lp:~rodrigo-moya/ubuntu/maverick/tomboy/add-u1-note
Merge into: lp:~ubuntu-desktop/tomboy/ubuntu
Diff against target: 70 lines (+47/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/05_add_start_u1_note.patch (+38/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/maverick/tomboy/add-u1-note
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Sebastien Bacher Pending
Ubuntu branches Pending
Review via email: mp+32348@code.launchpad.net

Description of the change

Add patch to have a Ubuntu One information note

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-11 15:53:51 +0000
3+++ debian/changelog 2010-08-11 16:12:46 +0000
4@@ -1,3 +1,11 @@
5+tomboy (1.3.1-1ubuntu2) maverick; urgency=low
6+
7+ * debian/patches/05_add_start_u1_note.patch:
8+ - Add patch to have a Ubuntu One information note on new installations
9+ (LP: #615876)
10+
11+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 11 Aug 2010 18:00:34 +0200
12+
13 tomboy (1.3.1-1ubuntu1b1) maverick; urgency=low
14
15 * No-change upload to rebuild against current debhelper, to drop sizable
16
17=== added file 'debian/patches/05_add_start_u1_note.patch'
18--- debian/patches/05_add_start_u1_note.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/05_add_start_u1_note.patch 2010-08-11 16:12:46 +0000
20@@ -0,0 +1,38 @@
21+diff --git a/Tomboy/NoteManager.cs b/Tomboy/NoteManager.cs
22+index be9f6d8..aa765bf 100644
23+--- a/Tomboy/NoteManager.cs
24++++ b/Tomboy/NoteManager.cs
25+@@ -294,6 +294,23 @@ Ciao!");
26+ "Also, if you type the name of another note in your " +
27+ "current note, it will automatically be linked for you." +
28+ "</note-content>");
29++ string u1_note_content =
30++ Catalog.GetString ("<note-content>" +
31++ "<bold>Tomboy is better with Ubuntu One</bold> - " +
32++ "the personal cloud that brings your digital life together.\n\n" +
33++ "Ubuntu One does more than sync your files - whether you need " +
34++ "to access your contacts, notes or bookmarks from any computer or " +
35++ "the web, enjoy your favorite music from a cloud integrated store " +
36++ "or stream your entire collection to iPhone and Android mobile phones " +
37++ "- we’ve raised the bar on personal clouds. Learn more at " +
38++ "<link:url>http://one.ubuntu.com/</link:url>.\n\n" +
39++ "Already have an Ubuntu One account? Setup Tomboy to sync with your " +
40++ "personal cloud by clicking Edit > Preferences and then the Synchronization "+
41++ "tab. Select \"Tomboy Web\" from the list of services and then click the "+
42++ "\"Connect to Server\" button. A web browser will appear with a few " +
43++ "additional instructions.\n\n" +
44++ "You can even enable automatic sync with Ubuntu One!" +
45++ "</note-content>");
46+
47+ try {
48+ Note start_note = Create (Catalog.GetString ("Start Here"),
49+@@ -305,6 +322,9 @@ Ciao!");
50+ links_note_content);
51+ links_note.QueueSave (ChangeType.ContentChanged);
52+
53++ Note u1_note = Create ("Ubuntu One", u1_note_content);
54++ u1_note.QueueSave (ChangeType.ContentChanged);
55++
56+ if (!Tomboy.IsPanelApplet)
57+ start_note.Window.Show ();
58+ } catch (Exception e) {
59
60=== modified file 'debian/patches/series'
61--- debian/patches/series 2010-08-11 15:53:51 +0000
62+++ debian/patches/series 2010-08-11 16:12:46 +0000
63@@ -1,6 +1,7 @@
64 01_dllmaps.patch
65 03_u1_as_default_sync.patch
66 04_app_indicator.patch
67+05_add_start_u1_note.patch
68 10_disable_unit_tests
69 11_lpi.patch
70 20_remove_pcfile_requires

Subscribers

People subscribed via source and target branches

to all changes: