[SCM] kjobwidgets packaging branch, master, updated. debian/5.37.0-2-82-g21e6bd2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 176d0c8c966afaad1d77c9a0adaaf3ba0e89af94
Merge: 31b2edb49721db3e03406f4f5340d6ecfbed383a 86dcbc06f8295e4dea5bfb548896447e852e26fb
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 16:25:24 2015 -0700

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

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

diff --cc debian/changelog
index 48b89cb,ffea788..ca7e320
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
 +kjobwidgets (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:15:39 -0700
 +
+ kjobwidgets (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>  Sat, 27 Jun 2015 12:03:17 +0200
+ 
  kjobwidgets (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 5ccc861,bdccb49..5843e8d
--- 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),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
                 libqt5x11extras5-dev (>= 5.4),
                 libx11-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),

-- 
kjobwidgets packaging