[SCM] kbookmarks packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g32ca8de

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kbookmarks.git;a=commitdiff;h=de8537e

The following commit has been merged in the kubuntu_wily_archive branch:
commit de8537e421d77e6ca986006bd33148e8c6c48d7d
Merge: 323582ba034f2f3d7f3336ac2b881e19f597c33e 343e2f70157c7f5acd97b1ced1b1a18efebdf6ee
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 16 13:38:25 2015 +0200

    Merge commit '343e2f70157c7f5acd97b1ced1b1a18efebdf6ee'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index 7005544,8e09134..7b158e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +kbookmarks (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:25:41 +0200
 +
+ kbookmarks (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:25:37 +0200
+ 
 +kbookmarks (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:03 +0100
 +
+ kbookmarks (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:35:15 +0100
+ 
 +kbookmarks (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:53 +0100
 +
  kbookmarks (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kbookmarks packaging