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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 2fa47986e38c918b3cf154590852bc654d8d9e7d
Author: Iain Lane <laney at debian.org>
Date:   Tue Aug 23 23:18:17 2011 +0100

    Update 06_ubuntu_sso.patch for new SyncService interface

diff --git a/debian/patches/06_use_ubuntu_sso.patch b/debian/patches/06_use_ubuntu_sso.patch
index 407a794..1abfa68 100644
--- a/debian/patches/06_use_ubuntu_sso.patch
+++ b/debian/patches/06_use_ubuntu_sso.patch
@@ -1,7 +1,7 @@
-Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/Makefile.am
+Index: tomboy/Tomboy/Addins/WebSyncService/Makefile.am
 ===================================================================
---- tomboy-1.7.1.orig/Tomboy/Addins/WebSyncService/Makefile.am	2011-07-06 10:02:14.880755215 +0100
-+++ tomboy-1.7.1/Tomboy/Addins/WebSyncService/Makefile.am	2011-07-06 10:02:42.779683467 +0100
+--- tomboy.orig/Tomboy/Addins/WebSyncService/Makefile.am	2011-08-23 22:54:40.127231333 +0100
++++ tomboy/Tomboy/Addins/WebSyncService/Makefile.am	2011-08-23 23:11:21.488427309 +0100
 @@ -27,6 +27,8 @@
  	$(srcdir)/WebSyncPreferencesWidget.cs   \
  	$(srcdir)/WebSyncServer.cs          \
@@ -11,10 +11,10 @@ Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/Makefile.am
  	$(srcdir)/Tests/*.cs            	\
  	$(srcdir)/Api/*.cs                  \
  	$(srcdir)/Api/Tests/*.cs            \
-Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs
+Index: tomboy/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ tomboy-1.7.1/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs	2011-07-06 10:02:17.950637287 +0100
++++ tomboy/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs	2011-08-23 23:18:01.453092749 +0100
 @@ -0,0 +1,290 @@
 +// Permission is hereby granted, free of charge, to any person obtaining 
 +// a copy of this software and associated documentation files (the 
@@ -306,11 +306,10 @@ Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs
 +		public event EventHandler AuthenticationError;
 +	}
 +}
-\ No newline at end of file
-Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs
+Index: tomboy/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ tomboy-1.7.1/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs	2011-07-06 10:02:17.950637287 +0100
++++ tomboy/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs	2011-08-23 23:14:17.277675713 +0100
 @@ -0,0 +1,229 @@
 +// Permission is hereby granted, free of charge, to any person obtaining 
 +// a copy of this software and associated documentation files (the 
@@ -402,7 +401,7 @@ Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs
 +			}
 +		}
 +
-+		public override Gtk.Widget CreatePreferencesControl ()
++		public override Gtk.Widget CreatePreferencesControl (EventHandler requiredPrefChanged)
 +		{
 +			string serverPref;
 +			Api.OAuth oauth;
@@ -541,10 +540,10 @@ Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/U1SyncServiceAddin.cs
 +		#endregion
 +	}
 +}
-Index: tomboy-1.7.1/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml
+Index: tomboy/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml
 ===================================================================
---- tomboy-1.7.1.orig/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml	2011-07-06 10:02:14.890754831 +0100
-+++ tomboy-1.7.1/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml	2011-07-06 10:02:17.950637287 +0100
+--- tomboy.orig/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml	2011-08-23 22:54:40.139230862 +0100
++++ tomboy/Tomboy/Addins/WebSyncService/WebSyncService.addin.xml	2011-08-23 23:11:21.488427309 +0100
 @@ -18,4 +18,8 @@
  	<Extension path="/Tomboy/SyncServiceAddins">
  		<SyncServiceAddin type="Tomboy.WebSync.WebSyncServiceAddin" />

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