[SCM] karchive packaging branch, master, updated. debian/5.37.0-2-99-gba9224a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 108a61d13944e19e14063b09181c19c2fa417dbe
Merge: b9fc2884907a12e6f0ba28bb379389239df96413 3c3b49531055e69742dc6b9f47c22b4173489090
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 19: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:29 +0100

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

diff --cc debian/changelog
index a8a4f05,b2d3296..7f19d00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- karchive (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
++karchive (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
 +
-   * Vivid backport. 
++  * Fix merge madness. 
 +
-  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 20:30:38 -0700
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 19:04:50 -0800
++
+ karchive (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:29 +0100
  
  karchive (5.15.0-0ubuntu1) wily; urgency=medium
  

-- 
karchive packaging