[SCM] marble packaging branch, master, updated. debian/16.08.3-1-154-g84802f6

Tue Nov 21 15:12:10 UTC 2017

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

The following commit has been merged in the master branch:
commit b8165baafbe1d5f90ab98d130f02bb74a7fd5cfe
Merge: 300cf2ec32062760987b4a0c14d0c62361dc6d07 57a9c3295fddc2e6927fd1408d0dcc4c2056d5c8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 11 22:29:32 2017 +0200

    Merge remote-tracking branch 'neon/Neon/stable'

 debian/changelog                                   |  96 ++++++++++++++++++
 debian/control                                     |  20 ++--
 debian/copyright                                   |  16 +--
 debian/libmarble-dev.install                       |   1 +
 ...5-25.install => libmarblewidget-qt5-28.install} |   2 +-
 debian/marble-data.install                         |  21 +++-
 debian/marble-data.lintian-overrides               |   1 +
 debian/marble-data.qml-ignore                      |   2 +
 debian/marble-plugins.lintian-overrides            |   2 +
 debian/marble-qt.install                           |   2 +-
 debian/marble.install                              |   6 +-
 debian/meta/cmake-ignore                           |   3 +
 debian/not-installed                               |  20 +---
 debian/rules                                       |   3 +
 debian/upstream/signing-key.asc                    | 112 +++++++++++++++++++++
 debian/watch                                       |   4 +-
 16 files changed, 272 insertions(+), 39 deletions(-)

diff --cc debian/changelog
index 6912d0c,e40203d..8ac4c63

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,99 +1,125 @@@
+ marble (4:17.08.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 05 Sep 2017 14:06:12 +0000
+ 
+ marble (4:17.08.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 17 Aug 2017 09:44:53 +0000
+ 
+ marble (4:17.04.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 12 Jul 2017 10:25:51 +0000
+ 
+ marble (4:17.04.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 07 Jun 2017 12:25:06 +0000
+ 
+ marble (4:17.04.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 11 May 2017 18:27:22 +0000
+ 
+ marble (4:17.04.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 19 Apr 2017 13:07:11 +0000
+ 
+ marble (4:16.12.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 08 Mar 2017 13:51:28 +0000
+ 
+ marble (4:16.12.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 08 Feb 2017 17:04:24 +0000
+ 
+ marble (4:16.12.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 11 Jan 2017 13:26:01 +0000
+ 
+ marble (4:16.12.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 14 Dec 2016 16:33:10 +0000
+ 
 +marble (4:16.08.3-1) unstable; urgency=medium
 +
 +  [ Automatic packaging ]
 +  * Refresh patches
 +  * Update symbols files with the buildds logs.
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (16.08.3)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 23 Nov 2016 22:04:04 +0100
 +
+ marble (4:16.08.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Mon, 21 Nov 2016 13:55:16 +0000
+ 
 +marble (4:16.08.2-1) unstable; urgency=medium
 +
 +  [ Automatic packaging ]
 +  * Refresh patches
 +  * Update symbols files from buildds logs (4:16.04.1-3).
 +  * Update symbols files
 +  * Update build-deps and deps with the info from cmake
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (16.08.2)
 +  * Update install files
 +  * Follow upstream libmarblewidget soversion bump
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 18 Oct 2016 10:57:31 +0200
 +
+ marble (4:16.08.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 14 Oct 2016 13:41:38 +0000
+ 
+ marble (4:16.08.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 16 Sep 2016 13:08:41 +0000
+ 
+ marble (4:16.08.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 18 Aug 2016 13:29:49 +0000
+ 
+ marble (4:16.04.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 12 Jul 2016 11:36:48 +0000
+ 
+ marble (4:16.04.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 16 Jun 2016 11:09:23 +0000
+ 
  marble (4:16.04.1-3) unstable; urgency=medium
  
    * Update symbols files with the buildds logs.
diff --cc debian/copyright
index 5722582,9dafbf8..654b355
--- a/debian/copyright
+++ b/debian/copyright
@@@ -2819,10 -2823,6 +2823,14 @@@ License: public-domai
   The MICRO WORLD DATA BANK II Database was was produced and placed in the
   Public Domain by Fred Pospeschil and Antonio Rivera.
  
 +Files: data/maps/earth/openstreetmap/tour.kml
 +       data/placemarks/COPYRIGHT
 +License: CC-BY-3.0
++ This work is licensed under a Creative Commons Attribution 3.0 License,
++ see http://creativecommons.org/licenses/by/3.0/
++ The Data is provided "as is" without warranty or any representation of
++ accuracy, timeliness or completeness.
 +
  Files: src/lib/marble/htmlfeatures/bootstrap.min.css
  Copyright: 2012, Twitter, Inc
  License: Apache-2.0
diff --cc debian/marble-data.install
index 1493159,cfe556e..6523d5b
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@@ -1,7 -1,6 +1,7 @@@
 +etc/xdg/marble.knsrc
  usr/share/applications/marble_geojson.desktop
  usr/share/config.kcfg/marble.kcfg
- usr/share/doc/HTML/en/marble/
+ usr/share/doc/HTML/*/marble/
  usr/share/icons/hicolor/*/apps/marble.png
  usr/share/kservices5/marble_thumbnail_geojson.desktop
  usr/share/kservices5/marble_thumbnail_gpx.desktop

-- 
marble packaging

