[SCM] kcmutils packaging branch, kubuntu_wily_backports, updated. ubuntu/5.15.0-0ubuntu2-24-gbd3195e

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 2159508bc9dc0d374f51a2d33c3631d7c4990492
Merge: 03cf3190275c09935fa6f40f721fbb1470a3ab97 5ac3f554828776c2ae0a0adca3ea4d5c4c470657
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Dec 2 21:52:03 2015 +0100

    Merge branch 'master' into kubuntu_unstable

 debian/changelog | 30 ++++++++++++++++++++++++++++++
 debian/control   | 30 +++++++++++++++++++-----------
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 6ae3dd2,e3804ad..b31ac50
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,33 +1,69 @@@
+ kcmutils (5.16.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.16.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 30 Nov 2015 12:12:44 +0100
+ 
+ kcmutils (5.15.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.15.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 09 Oct 2015 19:16:44 +0200
+ 
 +kcmutils (5.15.0-0ubuntu2) xenial; urgency=medium
 +
 +  * Fix autopackagetests by adding allow-stderr to the requirements.
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:31 +0100
 +
 +kcmutils (5.15.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 07 Oct 2015 13:43:29 +0100
 +
+ kcmutils (5.14.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.14.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 15 Sep 2015 13:49:47 +0200
+ 
 +kcmutils (5.14.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 13:10:26 +0100
 +
+ kcmutils (5.13.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.13.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Sep 2015 13:28:16 +0200
+ 
 +kcmutils (5.13.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:48:43 +0200
 +
+ kcmutils (5.12.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.12.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jul 2015 12:44:01 +0200
+ 
 +kcmutils (5.12.0-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +  * Fix merge, remove unused broken backport.
 +  * Vivid backport. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 03 Aug 2015 14:24:51 +0200
 +
  kcmutils (5.11.0-1) unstable; urgency=medium
  
    * New upstream release (5.10.0).
diff --cc debian/control
index eaed3e0,520ac1c..6ed3abb
--- a/debian/control
+++ b/debian/control
@@@ -27,12 -26,12 +26,21 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5kcmutils-dev
  Section: libdevel
  Architecture: any
++<<<<<<< HEAD
 +Depends: libkf5configwidgets-dev (>= 5.15.0~),
 +         libkf5iconthemes-dev (>= 5.15.0~),
 +         libkf5itemviews-dev (>= 5.15.0~),
 +         libkf5kcmutils5 (= ${binary:Version}),
 +         libkf5service-dev (>= 5.15.0~),
 +         libkf5xmlgui-dev (>= 5.15.0~),
++=======
+ Depends: libkf5configwidgets-dev (>= 5.16.0~),
+          libkf5iconthemes-dev (>= 5.16.0~),
+          libkf5itemviews-dev (>= 5.16.0~),
+          libkf5kcmutils5 (= ${binary:Version}),
+          libkf5service-dev (>= 5.16.0~),
+          libkf5xmlgui-dev (>= 5.16.0~),
++>>>>>>> master
           ${misc:Depends}
  Description: Extra APIs to write KConfig modules.
   Some utility classes for KSettings, KCModule and KPlugin.

-- 
kcmutils packaging