[SCM] frameworkintegration packaging branch, master, updated. debian/5.37.0-2-105-ge9c37f4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d1b057d242dc2f1143587fc58e33d1d02eb673af
Merge: 2f09da20794653d3f2940b42b06d8c353765f45a c5af39a10388d320d5af8a29fd8e923ea3af4a15
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19:03:48 2015 -0800

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

 debian/changelog     | 8 ++++++++
 debian/tests/control | 1 +
 2 files changed, 9 insertions(+)

diff --cc debian/changelog
index ad28f5e,486ed7c..7b67d97
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,22 @@@
 +frameworkintegration (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  * Vivid backport. 
 +  * Refresh install file.
 +  * Frameworkintegration requires kconf_update to build,
 +    which resides in libkf5config-bin. Adding to build deps. 
 +  * Revert last change, added runtime dep to kconfig instead
 +    due to the number of packages it affected. 
++  * 
++  * Fix merge madness. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 20:22:00 -0700
 +
+ frameworkintegration (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:28 +0100
+ 
  frameworkintegration (5.15.0-0ubuntu1) wily; urgency=medium
  
    [ Scarlett Clark ]

-- 
frameworkintegration packaging