[SCM] kauth packaging branch, master, updated. debian/5.37.0-2-103-g9185517

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 683158944a5f8569ac3ca97931f8053f043d1fa2
Merge: b2ee020d6cc8ff9aecba68297b40035ee9526407 b3d7e572ce5ee7090166706ddf840baaa4f9ef60
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:08:43 2015 -0800

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

 debian/changelog | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 36e903d,2d5d2fb..e68cf20
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,8 +1,31 @@@
++kauth (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
++
++  * Fix merge madness.
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 19:07:24 -0800
++
 +kauth (5.15.0-2~) UNRELEASED; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * Move bin-dev cmake files from the -dev package. Thanks to Aleix Pol
 +
 +  [ Scarlett Clark ]
 +  * Fix a typo in bin-dev install breaking build. 
++  * 
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 04 Nov 2015 17:07:35 +0100
 +
 +kauth (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:02 +0200
 +
- kauth (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
+ kauth (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:32:57 -0700
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:30 +0100
  
  kauth (5.15.0-0ubuntu1) wily; urgency=medium
  

-- 
kauth packaging