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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ce0240d938bcb761a71844a68ba2311c9b51f877
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Apr 12 16:29:58 2017 +0100

    locale, lintian happyness
---
 debian/copyright           | 16 +++++-----------
 debian/marble-data.install |  1 +
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 5722582..9dafbf8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2714,9 +2714,13 @@ Files: data/placemarks/HOWTO-cities.txt
        data/placemarks/statecodes.txt
        data/placemarks/timeZones.txt
 Copyright: No copyright holders listed
-License: CC-BY-3.0
 Comment: No explicit license found, using license(s) from:
  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: COPYING-CMAKE-SCRIPTS
        FindMarble.cmake.in
@@ -2819,10 +2823,6 @@ License: public-domain
  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
-
 Files: src/lib/marble/htmlfeatures/bootstrap.min.css
 Copyright: 2012, Twitter, Inc
 License: Apache-2.0
@@ -2871,12 +2871,6 @@ License: CC0
  along with the Software, see
  <http://creativecommons.org/publicdomain/zero/1.0/>
 
-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.
-
 License: Zlib
  This software is provided 'as-is', without any express or implied warranty.
  In no event will the authors be held liable for any damages arising from the use of this software.
diff --git a/debian/marble-data.install b/debian/marble-data.install
index b04ba69..d077768 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -12,6 +12,7 @@ usr/share/kservices5/plasma-applet-org.kde.plasma.worldclock.desktop
 usr/share/kservices5/plasma-wallpaper-org.kde.plasma.wallpaper.worldmap.desktop
 usr/share/kxmlgui5/marble/marble_part.rc
 usr/share/kxmlgui5/marble/marbleui.rc
+usr/share/locale/
 usr/share/marble/data/*.css
 usr/share/marble/data/*.html
 usr/share/marble/data/*.leg

-- 
marble packaging