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

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit b184b4648d6ffc3271c986bc81186f9b15b94775
Author: Ken VanDine <ken.vandine at canonical.com>
Date:   Fri Oct 14 09:38:21 2011 -0400

    Imported Debian patch 1.8.0-1ubuntu1.1

diff --git a/debian/changelog b/debian/changelog
index 055b679..bc4ba71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tomboy (1.8.0-1ubuntu1.1) oneiric-proposed; urgency=low
+
+  [ Iain Lane ]
+  * debian/control: Remove syncdaemon BD which is no longer required due to
+    the dropping of the SSO patch in 1.8.0-1ubuntu1 
+
+  [ Ken VanDine ]
+  * debian/patches/02_sync_save_button_sensitive.patch
+    - Set save button sensitive when needed (LP: #845321)
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Fri, 14 Oct 2011 09:38:21 -0400
+
 tomboy (1.8.0-1ubuntu1) oneiric; urgency=low
 
   [ Iain Lane ]
diff --git a/debian/control b/debian/control
index 6a6346e..bdb9fb3 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libmono-addins-gui-cil-dev (>= 0.3),
                liblaunchpad-integration-cil-dev,
                libappindicator0.1-cil-dev,
-               libproxy-dev,
-               libsyncdaemon-1.0-dev
+               libproxy-dev
 Standards-Version: 3.9.2
 Homepage: http://www.gnome.org/projects/tomboy/
 Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/tomboy.git
diff --git a/debian/patches/02_sync_save_button_sensitive.patch b/debian/patches/02_sync_save_button_sensitive.patch
new file mode 100644
index 0000000..997393c
--- /dev/null
+++ b/debian/patches/02_sync_save_button_sensitive.patch
@@ -0,0 +1,24 @@
+Description: Ensure the save button is sensitive when setting up WebSync. 
+This is a work around, but gets us back to where we were in Natty.  Upstream 
+relies on the entries changing to set the button sensitive, however we 
+pre-populate the fields with ubuntuone settings.  If these don't get changed 
+the user can not save the settings even after successful auth.  Ideally it
+should become sensitive when Auth.IsAccessToken becomes true.  
+Author: Ken VanDine <ken.vandine at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/845321
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=473332
+Forwarded: not-needed
+
+=== modified file 'Tomboy/PreferencesDialog.cs'
+--- old/Tomboy/PreferencesDialog.cs	2011-10-14 14:18:09 +0000
++++ new/Tomboy/PreferencesDialog.cs	2011-10-14 14:18:45 +0000
+@@ -1113,7 +1113,7 @@
+ 					syncAddinPrefsContainer.PackStart (syncAddinPrefsWidget, false, false, 0);
+ 
+ 					resetSyncAddinButton.Sensitive = false;
+-					saveSyncAddinButton.Sensitive = false;
++					saveSyncAddinButton.Sensitive = true;
+ 				}
+ 			} else {
+ 				selectedSyncAddin = null;
+
diff --git a/debian/patches/series b/debian/patches/series
index c412a50..3b0bdec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 01_dllmaps.patch
+02_sync_save_button_sensitive.patch
 03_u1_as_default_sync.patch
 04_app_indicator.patch
 05_add_start_u1_note.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

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