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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 8f7dae785e5efdd962b035025c0538a5e5a66abb
Author: Iain Lane <laney at debian.org>
Date:   Tue Jun 5 22:07:04 2012 +0100

    Refresh patches to apply cleanly

diff --git a/debian/patches/04_app_indicator.patch b/debian/patches/04_app_indicator.patch
index 98dee82..7d75c5a 100644
--- a/debian/patches/04_app_indicator.patch
+++ b/debian/patches/04_app_indicator.patch
@@ -1,8 +1,8 @@
 === modified file 'Tomboy/Makefile.am'
 Index: tomboy/Tomboy/Makefile.am
 ===================================================================
---- tomboy.orig/Tomboy/Makefile.am	2012-05-03 21:16:57.608547232 +0100
-+++ tomboy/Tomboy/Makefile.am	2012-05-03 21:17:00.972547084 +0100
+--- 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
 @@ -122,6 +122,7 @@
  	$(srcdir)/Tag.cs			\
  	$(srcdir)/TagButton.cs			\
@@ -21,8 +21,8 @@ Index: tomboy/Tomboy/Makefile.am
  	$(DBUS_LIBS)	\
 Index: tomboy/Tomboy/NoteManager.cs
 ===================================================================
---- tomboy.orig/Tomboy/NoteManager.cs	2012-05-03 21:16:57.584547233 +0100
-+++ tomboy/Tomboy/NoteManager.cs	2012-05-03 21:17:00.972547084 +0100
+--- 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
 @@ -369,6 +369,9 @@
  			// Update the trie so addins can access it, if they want.
  			trie_controller.Update ();
@@ -35,8 +35,8 @@ Index: tomboy/Tomboy/NoteManager.cs
  
 Index: tomboy/Tomboy/RecentChanges.cs
 ===================================================================
---- tomboy.orig/Tomboy/RecentChanges.cs	2012-05-03 21:16:57.596547233 +0100
-+++ tomboy/Tomboy/RecentChanges.cs	2012-05-03 21:17:00.972547084 +0100
+--- 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 @@
  			am ["DeleteNotebookAction"].Activated += OnDeleteNotebook;
  			am ["CloseWindowAction"].Activated += OnCloseWindow;
@@ -47,7 +47,7 @@ Index: tomboy/Tomboy/RecentChanges.cs
  				am ["CloseWindowAction"].Visible = false;
  
  			// Allow Escape to close the window as well as <Control>W
-@@ -1135,7 +1136,8 @@
+@@ -1141,7 +1142,8 @@
  			instance = null;
  #if !MAC
  			if (Tomboy.TrayIconShowing == false &&
@@ -59,8 +59,8 @@ Index: tomboy/Tomboy/RecentChanges.cs
  		}
 Index: tomboy/Tomboy/Tomboy.cs
 ===================================================================
---- tomboy.orig/Tomboy/Tomboy.cs	2012-05-03 21:16:57.576547234 +0100
-+++ tomboy/Tomboy/Tomboy.cs	2012-05-03 21:17:00.972547084 +0100
+--- 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
 @@ -191,11 +191,17 @@
  #endif
  		}
@@ -85,7 +85,7 @@ Index: tomboy/Tomboy/Tomboy.cs
 Index: tomboy/Tomboy/TomboyIndicatorTray.cs
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ tomboy/Tomboy/TomboyIndicatorTray.cs	2012-05-03 21:17:00.972547084 +0100
++++ tomboy/Tomboy/TomboyIndicatorTray.cs	2012-06-05 22:05:45.753783550 +0100
 @@ -0,0 +1,180 @@
 +//  
 +//  Copyright (C) 2009 GNOME Do
@@ -269,9 +269,9 @@ Index: tomboy/Tomboy/TomboyIndicatorTray.cs
 +}
 Index: tomboy/configure.in
 ===================================================================
---- tomboy.orig/configure.in	2012-05-03 21:16:57.552547235 +0100
-+++ tomboy/configure.in	2012-05-03 21:17:00.976547084 +0100
-@@ -204,6 +204,10 @@
+--- tomboy.orig/configure.in	2012-06-05 22:05:41.385783742 +0100
++++ tomboy/configure.in	2012-06-05 22:05:45.753783550 +0100
+@@ -207,6 +207,10 @@
  		  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
  AC_SUBST(GTKSHARP_LIBS)
  
@@ -284,8 +284,8 @@ Index: tomboy/configure.in
  #
 Index: tomboy/po/POTFILES.in
 ===================================================================
---- tomboy.orig/po/POTFILES.in	2012-05-03 21:16:57.564547233 +0100
-+++ tomboy/po/POTFILES.in	2012-05-03 21:17:00.976547084 +0100
+--- 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 @@
  Tomboy/Synchronization/SyncManager.cs
  Tomboy/Synchronization/SyncUtils.cs

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