[SCM] kitemviews packaging branch, master, updated. debian/5.37.0-2-81-ge8d261b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 67424e294e3fe902c7947b4bc633f081dd88a7c9
Merge: a934f3079ef8416a57d52fad287cd465ad0b575c 37785e749fa2ed7fce06b02f784a56e40bb5bfb1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 18:32:17 2015 -0800

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

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

diff --cc debian/changelog
index 4188cbc,688d223..6a95c9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- kitemviews (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
++kitemviews (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
 +
-   * Vivid backport. 
++  * Fix merge madness. 
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Nov 2015 18:32:04 -0800
++
+ kitemviews (5.15.0-0ubuntu2) xenial; urgency=medium
+ 
+   * Fix autopackagetests by adding allow-stderr to the requirements.
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 23:08:50 -0700
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:41 +0100
  
  kitemviews (5.15.0-0ubuntu1) wily; urgency=medium
  

-- 
kitemviews packaging