=== modified file 'debian/changelog'
--- debian/changelog	2011-04-06 12:46:11 +0000
+++ debian/changelog	2011-04-10 14:26:22 +0000
@@ -1,3 +1,9 @@
+tomboy (1.6.0-0ubuntu2) natty; urgency=low
+
+  * Don't show templates in the indicator (LP: #664963)
+
+ -- Greg Auger <gregory.auger@googlemail.com>  Sun, 10 Apr 2011 09:53:30 +0100
+
 tomboy (1.6.0-0ubuntu1) natty; urgency=low
 
   [ Rodrigo Moya ]

=== modified file 'debian/patches/04_app_indicator.patch'
--- debian/patches/04_app_indicator.patch	2010-12-03 08:57:00 +0000
+++ debian/patches/04_app_indicator.patch	2011-04-10 08:48:28 +0000
@@ -84,7 +84,7 @@
 === added file 'Tomboy/TomboyIndicatorTray.cs'
 --- old/Tomboy/TomboyIndicatorTray.cs	1970-01-01 00:00:00 +0000
 +++ new/Tomboy/TomboyIndicatorTray.cs	2010-12-03 14:20:19 +0000
-@@ -0,0 +1,178 @@
+@@ -0,0 +1,179 @@
 +//  
 +//  Copyright (C) 2009 GNOME Do
 +// 
@@ -218,8 +218,9 @@
 +			yield return new Gtk.SeparatorMenuItem ();
 +			
 +			if (manager != null && manager.Notes != null) {
++				Tag template_tag = TagManager.GetOrCreateSystemTag (TagManager.TemplateNoteSystemTag);
 +				var menuItems = manager.Notes
-+					.Where (n => !n.IsSpecial)
++					.Where (n => !n.IsSpecial && !n.ContainsTag(template_tag))
 +					.OrderByDescending (n => n.ChangeDate)
 +					.Take (10)
 +					.Select (n => CreateNoteMenuItem(n))