[SCM] marble packaging branch, master, updated. debian/4.14.2-1-25-g79aa27b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 79aa27b46764fc1da2707cb3f1613152fcff2db6
Merge: bad95224ae124963224b51a022d0c3b13c0b458f a79147a20b3a9f7d162e958cf4e5f1ba818ccfa0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 20:54:51 2015 +0100

    Merge commit 'a79147a20b3a9f7d162e958cf4e5f1ba818ccfa0'

 debian/changelog                                    | 13 +++++++++++++
 debian/patches/disable-MarbleRunnerManagerTest.diff | 15 +++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 29 insertions(+)

diff --cc debian/changelog
index 5f5032a,c182df3..a22b7f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,16 +1,29 @@@
 +marble (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 13:05:56 +0100
 +
+ marble (4:14.12.3-0ubuntu2) vivid; urgency=medium
+ 
+   * Disable running the MarbleRunnerManagerTest test. Upstream says
+     it is flakey and to be ignored.
+ 
+  -- Matthias Klose <doko at ubuntu.com>  Mon, 16 Mar 2015 18:02:12 +0100
+ 
+ marble (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:42:25 -0700
+ 
 +marble (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 20 Feb 2015 19:19:15 +0100
 +
  marble (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
marble packaging