[SCM] kjsembed packaging branch, master, updated. debian/5.37.0-2-83-g53325ad

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 41df654850dc75b20c59b58775b3430e2eabc2cb
Merge: 328fc7a0b486207e022e1487be2dab458275523f 226ebab73088a6bc66846496e2dfe8dee9cb7e34
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 18:05:00 2015 -0800

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

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

diff --cc debian/changelog
index 63488f3,ed49a9e..6fc89c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- kjsembed (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
++kjsembed (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
 +
-   * Vivid backport. 
++  * Fix this merge madness. 
 +
-  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 23:24:53 -0700
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 18:04:45 -0800
++
+ kjsembed (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:43 +0100
  
  kjsembed (5.15.0-0ubuntu1) wily; urgency=medium
  

-- 
kjsembed packaging