[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/1.0.0-1-10-g7924461

[Jo Shields]

The following commit has been merged in the master branch:
commit 7924461a1494c5c3249e51bcd283c69df5a646cd
Merge: 74059849fa80c6ecf0249992c9a387fd94739359 ec425100c6b8ab5a7913f7daf12b8a736b8e1f20
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Oct 8 21:58:06 2009 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/tomboy

diff --combined debian/changelog
index 764eac4,deaa5aa..1e08f98
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,10 @@@
 -tomboy (1.0.0-2) UNRELEASED; urgency=low
 +tomboy (1.0.0-2) unstable; urgency=low
  
    [ Iain Lane ]
    * debian/rules: Update the translation template after the build, doesn't
      affect Debian but is required for Ubuntu. Reduces the delta.
+   * debian/patches/02_support_oauth_1.0a.patch: Add upstream/Ubuntu patch to
+     support new OAuth protocol required by some services such as U1.
  
    [ Stefan Ebner ]
    * debian/rules:
@@@ -12,7 -14,7 +14,7 @@@
    * Added debian/dirs
    * debian/watch: Bump version to 3
  
-  -- Stefan Ebner <sebner at ubuntu.com>  Fri, 02 Oct 2009 23:24:57 +0200
+  -- Iain Lane <laney at ubuntu.com>  Wed, 07 Oct 2009 16:01:38 +0100
  
  tomboy (1.0.0-1) unstable; urgency=low
  

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