[SCM] kjobwidgets packaging branch, master, updated. debian/5.37.0-2-82-g21e6bd2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 378666ad1b1c360b00ca368f3e5850bca0380d6f
Merge: f73aeb293c5a6c17d65bb41cedafe4af3bc792c4 bf4899d15a27f4c6b6ae9088e1b5ac8968612165
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 18:37:06 2015 -0800

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

 debian/changelog     | 11 ++++++++---
 debian/tests/control |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 66f4faf,30f688b..b2d2288
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,14 @@@
- kjobwidgets (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
++kjobwidgets (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
 +
-   * Vivid backport. 
++  * Fix merge madness. 
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 18:36:56 -0800
++
+ kjobwidgets (5.15.0-0ubuntu2) xenial; urgency=medium
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 23:16:47 -0700
+   * Fix autopackagetests by adding allow-stderr to the requirements.
  
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:42 +0100
 -
  kjobwidgets (5.15.0-0ubuntu1) wily; urgency=medium
  
    [ Scarlett Clark ]

-- 
kjobwidgets packaging