[SCM] krunner packaging branch, master, updated. 09a21bdb3761f6fd55907c21100983bb619fd593

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit aafbc878efd1bb0a4671e72020a5e4c3dc7b4dff
Merge: 8b005fe036c1cc83d7a64f55771f2eb43fcabbb6 acefc4af5848f54be7d4acf3051013966b1a7e5e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:24:53 2015 +0200

    Merge commit 'acefc4af5848f54be7d4acf3051013966b1a7e5e'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index ee99afe,1aa65a4..35b4b34
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,21 +1,47 @@@
 +krunner (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:23:07 +0200
 +
+ krunner (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:21:01 +0200
+ 
 +krunner (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Mar 2015 17:45:51 +0100
 +
+ krunner (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:47:21 +0100
+ 
+ krunner (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:03:24 +0100
+ 
 +krunner (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update copyright information.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Feb 2015 16:12:48 +0100
 +
  krunner (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
krunner packaging