[Pkg-cli-apps-commits] [tomboy] 02/05: Merge branch 'master' into experimental

[Iain Lane]

This is an automated email from the git hooks/post-receive script.

laney pushed a commit to branch experimental
in repository tomboy.

commit f402df5d35756c69297168b75f97ab914538a58c
Merge: 480f91d 1a1a9c1
Author: Iain Lane <laney at debian.org>
Date:   Fri May 2 16:09:32 2014 +0100

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog                     | 12 ++++++++++++
 debian/control                       |  4 ++--
 debian/patches/series                |  1 +
 debian/patches/use_dbussharp_2.patch | 27 +++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 5174ab0,26c6b5c..e227b00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,15 +1,38 @@@
 +tomboy (1.15.4-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Iain Lane <laney at debian.org>  Fri, 02 May 2014 16:05:37 +0100
 +
 +tomboy (1.15.2-2) experimental; urgency=low
 +
 +  * [408c915] Update libproxy DllMap for new SONAME (Closes: #725495)
 +
 + -- Iain Lane <laney at debian.org>  Mon, 04 Nov 2013 12:31:50 +0000
 +
 +tomboy (1.15.2-1) experimental; urgency=low
 +
 +  * [91d5baf] Track unstable versions
 +  * [6aa1bf6] Imported Upstream version 1.15.2
 +    + Center Preferences and About window on screen
 +    + Compatibility fix for Rainy
 +    + Fix HTML export with colon
 +    + Add preference for startup notes
 +
 + -- Iain Lane <laney at debian.org>  Sun, 09 Jun 2013 19:35:47 +0100
 +
+ tomboy (1.14.1-3) unstable; urgency=low
+ 
+   * [f8ca679] Switch to new DBUS# API.
+ 
+  -- Jo Shields <directhex at apebox.org>  Thu, 09 Jan 2014 10:46:46 +0000
+ 
+ tomboy (1.14.1-2) unstable; urgency=low
+ 
+   * [971fd79] Update libproxy DllMap for new SONAME (Closes: #725495)
+ 
+  -- Iain Lane <laney at debian.org>  Mon, 04 Nov 2013 12:28:29 +0000
+ 
  tomboy (1.14.1-1) unstable; urgency=low
  
    * [5449ff8] debian/watch: Use GNOME ftp and track stable releases only

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/tomboy.git