[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.12.0-1ubuntu1-20-g2c0dee1

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 1f3610a24f90ecea09e4f58886ce9bb288970884
Author: Iain Lane <laney at debian.org>
Date:   Sun Jun 9 19:49:58 2013 +0100

    Refresh debian/patches/04_app_indicator.patch

diff --git a/debian/patches/04_app_indicator.patch b/debian/patches/04_app_indicator.patch
index 7d75c5a..c8c9e03 100644
--- a/debian/patches/04_app_indicator.patch
+++ b/debian/patches/04_app_indicator.patch
@@ -1,8 +1,6 @@
 === modified file 'Tomboy/Makefile.am'
-Index: tomboy/Tomboy/Makefile.am
-===================================================================
---- tomboy.orig/Tomboy/Makefile.am	2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/Makefile.am	2012-06-05 22:05:45.753783550 +0100
+--- a/Tomboy/Makefile.am
++++ b/Tomboy/Makefile.am
 @@ -122,6 +122,7 @@
  	$(srcdir)/Tag.cs			\
  	$(srcdir)/TagButton.cs			\
@@ -19,10 +17,8 @@ Index: tomboy/Tomboy/Makefile.am
  	$(GNOME_LIBS) 	\
  	-r:Mono.Posix	\
  	$(DBUS_LIBS)	\
-Index: tomboy/Tomboy/NoteManager.cs
-===================================================================
---- tomboy.orig/Tomboy/NoteManager.cs	2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/NoteManager.cs	2012-06-05 22:05:45.753783550 +0100
+--- a/Tomboy/NoteManager.cs
++++ b/Tomboy/NoteManager.cs
 @@ -369,6 +369,9 @@
  			// Update the trie so addins can access it, if they want.
  			trie_controller.Update ();
@@ -33,11 +29,9 @@ Index: tomboy/Tomboy/NoteManager.cs
  			bool startup_notes_enabled = (bool)
  			                             Preferences.Get (Preferences.ENABLE_STARTUP_NOTES);
  
-Index: tomboy/Tomboy/RecentChanges.cs
-===================================================================
---- tomboy.orig/Tomboy/RecentChanges.cs	2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/RecentChanges.cs	2012-06-05 22:05:45.753783550 +0100
-@@ -247,7 +247,8 @@
+--- a/Tomboy/RecentChanges.cs
++++ b/Tomboy/RecentChanges.cs
+@@ -248,7 +248,8 @@
  			am ["DeleteNotebookAction"].Activated += OnDeleteNotebook;
  			am ["CloseWindowAction"].Activated += OnCloseWindow;
  			if (Tomboy.TrayIconShowing == false &&
@@ -47,7 +41,7 @@ Index: tomboy/Tomboy/RecentChanges.cs
  				am ["CloseWindowAction"].Visible = false;
  
  			// Allow Escape to close the window as well as <Control>W
-@@ -1141,7 +1142,8 @@
+@@ -1127,7 +1128,8 @@
  			instance = null;
  #if !MAC
  			if (Tomboy.TrayIconShowing == false &&
@@ -57,10 +51,8 @@ Index: tomboy/Tomboy/RecentChanges.cs
  				Tomboy.ActionManager ["QuitTomboyAction"].Activate ();
  #endif
  		}
-Index: tomboy/Tomboy/Tomboy.cs
-===================================================================
---- tomboy.orig/Tomboy/Tomboy.cs	2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/Tomboy/Tomboy.cs	2012-06-05 22:05:45.753783550 +0100
+--- a/Tomboy/Tomboy.cs
++++ b/Tomboy/Tomboy.cs
 @@ -191,11 +191,17 @@
  #endif
  		}
@@ -82,10 +74,8 @@ Index: tomboy/Tomboy/Tomboy.cs
  			StartMainLoop ();
  		}
  
-Index: tomboy/Tomboy/TomboyIndicatorTray.cs
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ tomboy/Tomboy/TomboyIndicatorTray.cs	2012-06-05 22:05:45.753783550 +0100
+--- /dev/null
++++ b/Tomboy/TomboyIndicatorTray.cs
 @@ -0,0 +1,180 @@
 +//  
 +//  Copyright (C) 2009 GNOME Do
@@ -267,10 +257,8 @@ Index: tomboy/Tomboy/TomboyIndicatorTray.cs
 +		}
 +	}
 +}
-Index: tomboy/configure.in
-===================================================================
---- tomboy.orig/configure.in	2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/configure.in	2012-06-05 22:05:45.753783550 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -207,6 +207,10 @@
  		  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
  AC_SUBST(GTKSHARP_LIBS)
@@ -282,11 +270,9 @@ Index: tomboy/configure.in
  #
  # Printing at least needs Mono.Cairo
  #
-Index: tomboy/po/POTFILES.in
-===================================================================
---- tomboy.orig/po/POTFILES.in	2012-06-05 22:05:41.385783742 +0100
-+++ tomboy/po/POTFILES.in	2012-06-05 22:05:45.757783549 +0100
-@@ -68,6 +68,7 @@
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -70,6 +70,7 @@
  Tomboy/Synchronization/SyncManager.cs
  Tomboy/Synchronization/SyncUtils.cs
  Tomboy/Tomboy.cs

-- 
Tomboy - desktop note taking program using Wiki style links