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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit a6712fcc19eb52485b419dbc370f0b280a6b7093
Author: Rodrigo Moya <rodrigo.moya at canonical.com>
Date:   Mon Sep 26 23:38:59 2011 +0100

    Disable U1 SSO patch & refresh u1_as_default_sync_source patch
    
    * debian/patches/06_use_ubuntu_sso.patch:
      - Disabled SSO patch, as it's not working on Oneiric, and also allows
        to remove the dependency on libubuntuone.
    * debian/patches/03_u1_as_default_sync.patch:
      - Rebased

diff --git a/debian/WebSyncServiceAddin.dll.config b/debian/WebSyncServiceAddin.dll.config
index 9ed8a4a..0c2d3a0 100644
--- a/debian/WebSyncServiceAddin.dll.config
+++ b/debian/WebSyncServiceAddin.dll.config
@@ -1,5 +1,4 @@
 <configuration>
   <dllmap dll="gobject-2.0" target="libgobject-2.0.so.0"/>
-  <dllmap dll="syncdaemon-1.0" target="libsyncdaemon-1.0.so.1"/>
   <dllmap dll="proxy" target="libproxy.so.0"/>
 </configuration>
diff --git a/debian/patches/03_u1_as_default_sync.patch b/debian/patches/03_u1_as_default_sync.patch
index e3e181d..96522dc 100644
--- a/debian/patches/03_u1_as_default_sync.patch
+++ b/debian/patches/03_u1_as_default_sync.patch
@@ -1,7 +1,7 @@
 Index: tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
 ===================================================================
---- tomboy.orig/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs	2011-08-23 22:46:32.000000000 +0100
-+++ tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs	2011-08-23 22:51:52.665782607 +0100
+--- tomboy.orig/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs	2011-09-26 22:25:08.135886195 +0100
++++ tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs	2011-09-26 23:37:26.202367732 +0100
 @@ -97,6 +97,8 @@
  			string serverPref;
  			Api.OAuth oauth;
diff --git a/debian/patches/series b/debian/patches/series
index 113bd79..c412a50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 03_u1_as_default_sync.patch
 04_app_indicator.patch
 05_add_start_u1_note.patch
-06_use_ubuntu_sso.patch
+#06_use_ubuntu_sso.patch
 11_lpi.patch
 20_remove_pcfile_requires
 30_fix_manpage_syntax

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