[SCM] kwallet packaging branch, master, updated. 8d40dfd5d8eee046142894d1062911210ece5629

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b801f0b75e8991b1b6fc1f05175c7d5322dac827
Merge: 0661cf16ddc3fc0ae8521dc86faf49bbbbb755d7 38fd0cca1daeacf614c775f5aaa989257b3c571c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:33:01 2015 +0200

    Merge commit '38fd0cca1daeacf614c775f5aaa989257b3c571c'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 15bbe68,287eef3..9cff9ac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kwallet-kf5 (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:22:06 +0200
 +
+ kwallet-kf5 (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:17:04 +0200
+ 
 +kwallet-kf5 (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:39:06 +0100
 +
+ kwallet-kf5 (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:28:48 +0100
+ 
 +kwallet-kf5 (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:55 +0100
 +
  kwallet-kf5 (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kwallet packaging