[SCM] kconfig packaging branch, master, updated. debian/5.37.0-2-99-ga0d64c3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b095262b3e1de3ab4f2cecb4afb817d59cf982fe
Merge: b695790d114825013744a104adecb204b8ab5065 bd7f77f61688134b49b950099f4ab0231446fc4a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:16:37 2015 -0800

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

 debian/changelog | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 1bf1d02,a85d820..cae5482
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,8 +1,35 @@@
++kconfig (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
++
++  * Fix merge madness.
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 19:15:41 -0800
++
 +kconfig (5.15.0-2~) UNRELEASED; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * Move ConfigCompiler cmake files to the -bin-dev package.
 +
 +  [ Scarlett Clark ]
 +  * Everything is failing due to a lack of kconf_update binary
 +    needed at buildtime. Adding libkf5config-bin as a depend
 +    to libkf5config-dev ranther than updating every package 
 +    with the build dependency. 
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Oct 2015 15:17:21 +0100
 +
 +kconfig (5.15.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.15.0).
 +  * Update symbols files from buildds logs (5.14.0-1).
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 09 Oct 2015 19:15:54 +0200
 +
- kconfig (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
+ kconfig (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:44:13 -0700
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:32 +0100
  
  kconfig (5.15.0-0ubuntu1) wily; urgency=medium
  

-- 
kconfig packaging