[SCM] marble packaging branch, master, updated. debian/4.14.2-1-21-gbad9522

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6e218099acae6211e9f899239e703e61c4c4d0de
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 20 09:01:34 2015 +0100

    Minor aesthetic changes
---
 debian/changelog | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bfe55d..e9d5404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ marble (4:14.12.2-1~) UNRELEASED; urgency=medium
 marble (4:14.12.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
-  * Remove unstable from watch file, uscan fails with 
+  * Remove unstable from watch file, uscan fails with
     remote site does not even have current version
   * batchpatch new symbols.
 
@@ -124,7 +124,7 @@ marble (4:4.14.0-0ubuntu1) utopic; urgency=medium
 
 marble (4:4.13.97-0ubuntu2) utopic; urgency=medium
 
-  * Update .symbols file for armhf 
+  * Update .symbols file for armhf
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 04 Aug 2014 18:17:17 +0200
 
@@ -168,7 +168,7 @@ marble (4:4.13.90-0ubuntu1) utopic; urgency=medium
 
   [ Scarlett Clark ]
   * New upstream beta release
-  * Update: do_not_install_private_headers. 
+  * Update: do_not_install_private_headers.
 
  -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 23:38:32 +0200
 
@@ -193,6 +193,11 @@ marble (4:4.13.1-2ubuntu1) utopic; urgency=medium
     - Add libwlocate-dev to build deps
     - Keep our symbols files
 
+  [ Harald Sitter ]
+  * Split marble-mobile into an own package LP: #1312104
+    + Dependency/Suggests retained from marble package (at least the deps
+      actually are confirmed as required)
+
  -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 12 Jun 2014 19:15:58 +0200
 
 marble (4:4.13.1-2) unstable; urgency=medium
@@ -223,14 +228,6 @@ marble (4:4.13.1-1) experimental; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 26 May 2014 11:25:02 +0200
 
-marble (4:4.13.0-0ubuntu2) UNRELEASED; urgency=medium
-
-  * Split marble-mobile into an own package LP: #1312104
-    + Dependency/Suggests retained from marble package (at least the deps
-      actually are confirmed as required)
-
- -- Harald Sitter <apachelogger at kubuntu.org>  Fri, 25 Apr 2014 09:39:29 +0200
-
 marble (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -530,7 +527,7 @@ marble (4:4.10.2-0ubuntu1) raring; urgency=low
 marble (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
 
   * New upstream bugfix release
-  * Add a new symbol to libmarblewidget15.symbols 
+  * Add a new symbol to libmarblewidget15.symbols
 
  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Mar 2013 16:44:44 +0000
 
@@ -540,7 +537,7 @@ marble (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
   * New upstream release
 
   [ Philip Muškovac ]
-  * Build-depend on libqextserialport-dev 
+  * Build-depend on libqextserialport-dev
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 12:09:45 +0000
 
@@ -672,7 +669,7 @@ marble (4:4.8.2-0ubuntu1) precise; urgency=low
 
 marble (4:4.8.1-0ubuntu1) precise; urgency=low
 
-  * New upstream release 
+  * New upstream release
     - update marble-plugins.install for new install location of qml plugins
     - remove missing private symbols from libmarblewidget13.symobls
 
@@ -699,7 +696,7 @@ marble (4:4.7.95-0ubuntu1) precise; urgency=low
   [ Philip Muškovac ]
   * New upstream release candidate
     - update marble-plugins.install
-  
+
   [ Felix Geyer ]
   * Update symbols files.
 
@@ -774,7 +771,7 @@ marble (4:4.7.1-0ubuntu1) oneiric; urgency=low
 
 marble (4:4.7.0-0ubuntu1) oneiric; urgency=low
 
-  * New upstream release 
+  * New upstream release
     - remove missing private symbols from libmarblewidget12.symbols and
       add new symbols.
 
@@ -787,4 +784,3 @@ marble (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
   * Repack upstream source to include missing license copies
 
  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 11 Jul 2011 15:43:02 +0200
-

-- 
marble packaging