[SCM] kcoreaddons packaging branch, master, updated. debian/5.37.0-2-101-ga15783a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8eb86e4d9ddfbdc4012422334ea51b65f0fdc415
Merge: d78ad79fb4890fd689ed5fe753d190a9a1733df6 b294f6a38db9a1367d16003ade7a580615294397
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:22:25 2015 -0800

    Fix autopackagetests by adding allow-stderr to the requirements.
    -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:33 +0100

 debian/changelog | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 7081a86,366d6ec..9d19af9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
++kcoreaddons (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
++
++  * Fix merge madness.
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 19:21:19 -0800
++
 +kcoreaddons (5.15.0-2~) UNRELEASED; urgency=medium
 +
++  [ Maximiliano Curia ]
 +  * Move bin-dev cmake files from the -dev package. Thanks to Aleix Pol
- 
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 04 Nov 2015 17:05:18 +0100
 +
 +kcoreaddons (5.15.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.15.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 09 Oct 2015 19:15:59 +0200
 +
- kcoreaddons (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
+ kcoreaddons (5.15.0-0ubuntu2) xenial; urgency=medium
  
-   * Vivid backport. 
+   * Fix autopackagetests by adding allow-stderr to the requirements.
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 20:56:24 -0700
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:33 +0100
  
  kcoreaddons (5.15.0-0ubuntu1) wily; urgency=medium
  

-- 
kcoreaddons packaging