[SCM] kmediaplayer packaging branch, master, updated. debian/5.37.0-2-75-g4b1fbb2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 155797706b9dabfcfd6b66244b1f83f98103831c
Merge: 0f22ba02ab54df13b41d3eca6ea9cf0cc2a22742 ee1f053cdc5d61ae4d55b19811cc0c53677cd725
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 17:11:41 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog
    	debian/control

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

diff --cc debian/changelog
index 062c2a5,e9e1d2d..3b8f92b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
 +kmediaplayer (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:17:20 -0700
 +
+ 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 ]
diff --cc debian/control
index bac82e6,51b39ba..4e80108
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,9 +5,9 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                libkf5parts-dev (>= 5.12.0),
-                libkf5xmlgui-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5parts-dev (>= 5.11.0~),
 -               libkf5xmlgui-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5parts-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 xauth,
@@@ -22,7 -22,7 +22,7 @@@ Package: libkf5mediaplayer-de
  Section: libdevel
  Architecture: any
  Depends: libkf5mediaplayer5 (= ${binary:Version}),
-          libkf5parts-dev (>= 5.12.0),
 -         libkf5parts-dev (>= 5.11.0~),
++         libkf5parts-dev (>= 5.12.0~),
           ${misc:Depends}
  Description: Plugin interface for media player features.
   It provides all of the necessary media player operations,

-- 
kmediaplayer packaging