[SCM] kmediaplayer packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gdb5eac6

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 2339bc8f752ffc2f0fb335b7df224cb646869bbd
Merge: 7f6f58b1e1e7b2d259cb9dda06eb5bef329bf37d ee00f91019a4d9a70c53dfd0a8596e31e68367b0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:51:33 2015 +0200

    Merge commit 'ee00f91019a4d9a70c53dfd0a8596e31e68367b0'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 82707f6,4e6a147..f794ea2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,21 +1,47 @@@
 +kmediaplayer (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:24:22 +0200
 +
+ kmediaplayer (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:22:39 +0200
+ 
 +kmediaplayer (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:48 +0100
 +
+ kmediaplayer (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:48:57 +0100
+ 
+ kmediaplayer (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:02:55 +0100
+ 
 +kmediaplayer (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 copyright information.
 +  * Update install files.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Feb 2015 17:38:30 +0100
 +
  kmediaplayer (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kmediaplayer packaging