[SCM] marble packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.2-0ubuntu2-26-g34b7389

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=34b7389

The following commit has been merged in the kubuntu_unstable branch:
commit 34b7389dafca575361483cec46481b49b7030344
Merge: 5cb85f7f46b9a66d1ef60508342bf9515bb1fbe1 548b8ff028560c2455adf321e6e569b38f679b14
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Wed Nov 11 00:08:25 2015 +0000

    Merging kubuntu_stable into kubuntu_unstable.

 debian/changelog     | 6 ++++++
 debian/tests/control | 1 +
 2 files changed, 7 insertions(+)

diff --cc debian/changelog
index cad234c,96b65b4..28319dc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,19 @@@
 +marble (4:15.11.80-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Build with MARBLE_INSTALL_ANDROID_APPS
 +
 +  [ Scarlett Clark ]
 +  * Refresh fix_qmake_fallback.diff patch. 
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Sep 2015 13:20:57 +0100
 +
+ marble (4:15.08.2-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:54 +0100
+ 
  marble (4:15.08.2-0ubuntu1) wily; urgency=medium
  
    * Vivid backport

-- 
marble packaging