[SCM] kmediaplayer packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-gee1f053

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit ee1f053cdc5d61ae4d55b19811cc0c53677cd725
Merge: eb38713f4e1c4332fb54667de99cc242f7c24aa3 951df9e3f66ea88c674c416f183227316c352946
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:55:32 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog | 7 +++++++
 debian/control   | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 44af5c8,1d5e66b..e9e1d2d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kmediaplayer (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 14:21:56 +0200
+ 
 +kmediaplayer (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:10:12 +0200
 +
  kmediaplayer (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kmediaplayer packaging