[SCM] marble packaging branch, kubuntu_unstable, updated. ubuntu/15.08.0-0ubuntu4-17-g5614fc1

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5614fc117972ab4a67f391d10176b4c74db9b4ac
Merge: 58624e13da52f98685a2bd431b01f957e1d6ef1d 0a92ff8e3eab19e330a04e5d5bf3a1d1e87e8139
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Thu Sep 17 10:42:30 2015 +0000

    Merging kubuntu_stable into kubuntu_unstable.

 debian/changelog | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 653f0a2,10c48f1..0d8d50b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,12 +1,18 @@@
 +marble (4:15.11.80-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Build with MARBLE_INSTALL_ANDROID_APPS
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Sep 2015 13:20:57 +0100
 +
- marble (4:15.08.0-0ubuntu6) UNRELEASED; urgency=medium
+ marble (4:15.08.1-0ubuntu1) UNRELEASED; urgency=medium
  
+   [ Jonathan Riddell ]
    * Add missing marble-qt.install file
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 16 Sep 2015 13:53:51 +0100
+   [ Clive Johnston ]
+   * New upstream release (15.18.1)
+ 
+  -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 11:41:17 +0100
  
  marble (4:15.08.0-0ubuntu5) wily; urgency=medium
  

-- 
marble packaging