Merge lp:~rodrigo-moya/ubuntu/maverick/tomboy/1_3_2_release into lp:~ubuntu-desktop/tomboy/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-18 11:29:38 +0000
+++ debian/changelog	2010-08-26 15:27:46 +0000
@@ -1,3 +1,24 @@
+tomboy (1.3.2-1ubuntu1) maverick; urgency=low
+
+  * New upstream release 1.3.2
+    + Support gtk# >= 2.12.10
+    + Escape note titles in rename dialog
+    + Allow empty username field
+    + Help improvements
+    + Improve Tomboy's presentation for Add/Remove programs
+    + Do not open search at startup when tray icon is not ready after 2 secs
+    + Require .Net framework 3.5
+    + Add the missing resource "tomboy-note-clipboard-html.xsl" and clean up
+      the msbuild file.
+    + Allow (major) upgrades, deny downgrades in Setup
+    + Enable proper popup behavior on Windows
+    + Export linked notes correctly on Windows
+    + Replace obsolete .Log() method calls with .Debug/.Info/.Warn/.Error
+    + Fail more gracefully if recent item tracking for the taskbar is disabled
+    + Updated translations
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 26 Aug 2010 15:05:29 +0200
+
 tomboy (1.3.1-1ubuntu5) maverick; urgency=low
 
   * debian/patches/06_use_ubuntu_sso.patch:

=== modified file 'debian/patches/04_app_indicator.patch'
--- debian/patches/04_app_indicator.patch	2010-08-11 15:53:51 +0000
+++ debian/patches/04_app_indicator.patch	2010-08-26 15:27:46 +0000
@@ -77,7 +77,7 @@
 ===================================================================
 --- tomboy-1.3.1.orig/Tomboy/Tomboy.cs	2010-06-28 20:20:19.000000000 +0100
 +++ tomboy-1.3.1/Tomboy/Tomboy.cs	2010-07-06 13:04:13.598602462 +0100
-@@ -189,17 +189,22 @@
+@@ -189,10 +189,16 @@
  #endif
  		}
  
@@ -87,28 +87,17 @@
 -			// Create the tray icon and run the main loop
 -			tray_icon = new TomboyTrayIcon (manager);
 -			tray = tray_icon.Tray;
--
--			// Give the TrayIcon 2 seconds to appear.  If it
--			// doesn't by then, open the SearchAllNotes window.
--			tray_icon_showing = tray_icon.IsEmbedded && tray_icon.Visible;
--			if (!tray_icon_showing)
--				GLib.Timeout.Add (2000, CheckTrayIconShowing);
 +			if (TomboyIndicatorTray.IndicatorTrayPresent) {
 +				indicator = new TomboyIndicatorTray (manager);
 +			} else {
 +				// Create the tray icon and run the main loop
 +				tray_icon = new TomboyTrayIcon (manager);
 +				tray = tray_icon.Tray;
-+				
-+				// Give the TrayIcon 2 seconds to appear.  If it
-+				// doesn't by then, open the SearchAllNotes window.
-+				tray_icon_showing = tray_icon.IsEmbedded && tray_icon.Visible;
-+				if (!tray_icon_showing)
-+					GLib.Timeout.Add (2000, CheckTrayIconShowing);
 +			}
- 
++
  			StartMainLoop ();
  		}
+
 @@ -214,7 +219,8 @@
  			// can still use Tomboy.
  #if !MAC