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

Tue Nov 21 15:11:45 UTC 2017

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

The following commit has been merged in the master branch:
commit 38a1350e9279a2947d6b2f8d8e1b57cf951e8745
Merge: e32a2ab55992834b96adce35222b0e4ee85cc945 2f48585c84a253f4542fb279501e543b27f2a1ae
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jun 16 14:54:25 2016 +0100

    merge master

 debian/changelog                              |  25 +-
 debian/control                                |   2 +
 debian/copyright                              | 920 ++++++++++++++++++++------
 debian/libmarblewidget-qt5-24.symbols         | 141 ++--
 debian/marble-data.install                    |   1 +
 debian/patches/do_not_install_private_headers |   2 +-
 6 files changed, 823 insertions(+), 268 deletions(-)

diff --cc debian/changelog
index 266d55e,5707080..4e94652

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,17 +1,23 @@@
 +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.0-1~2.gbp59049e) UNRELEASED; urgency=medium
+ marble (4:16.04.1-3) unstable; urgency=medium
  
-   ** SNAPSHOT build @59049e71e540ca609e562198eb1ea610175b6db7 **
+   * Update symbols files with the buildds logs.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 05 Jun 2016 23:48:43 +0200
+ 
+ marble (4:16.04.1-2) unstable; urgency=medium
+ 
+   * Release to unstable.
+   * Update symbols files with the buildds logs.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 05 Jun 2016 14:13:35 +0200
+ 
+ marble (4:16.04.1-1) experimental; urgency=medium
  
    [ Automatic packaging ]
    * Bump Standards-Version to 3.9.8
diff --cc debian/copyright
index e1b8f6d,29c08ef..5722582
--- a/debian/copyright
+++ b/debian/copyright
@@@ -2268,65 -2799,29 +2799,29 @@@ Files: tools/osm-addresses/pbf/fileform
         tools/osm-addresses/pbf/osmformat.proto
  Copyright: 2010, Scott A. Crosby <scott at sacrosby.com>
  License: LGPL-3+
+  This program is free software: you can redistribute it and/or modify
 - it under the terms of the GNU Lesser General Public License as 
 - published by the Free Software Foundation, either version 3 of the 
++ it under the terms of the GNU Lesser General Public License as
++ published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+  .
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+  .
+  The full text of the GNU Lesser General Public License version 3 can be found
+  in the file `/usr/share/common-licenses/LGPL-3'.
  
  Files: data/mwdbii/MWDBPOLY.TXT
         data/mwdbii/contents.txt
  Copyright: no copyright claimed
  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. 
++ The MICRO WORLD DATA BANK II Database was was produced and placed in the
++ Public Domain by Fred Pospeschil and Antonio Rivera.
  
- Files: src/apps/marble-touch/harmattan/MenuItemSwitch.qml
- Copyright: 2011, Dennis Nienhüser <earthwings at gentoo.org>
-            2011, Nokia Corporation and/or its subsidiary(-ies)
- License: BSD-3-clause/LGPL-2.1
-  This file is part of the Marble Virtual Globe.
-  .
-  This program is free software licensed under the GNU LGPL. You can
-  find a copy of this license in LICENSE.txt in the top directory of
-  the source code.
-  .
-  Copyright 2011      Dennis Nienhüser <earthwings at gentoo.org>
-  .
-  Large parts of this file are based on the file MenuItem.qml found
-  in the Qt Components project with the following disclaimer:
-  .
-  Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-  All rights reserved.
-  Contact: Nokia Corporation (qt-info at nokia.com)
-  .
-  This file is part of the Qt Components project.
-  .
-  You may use this file under the terms of the BSD license as follows:
-  .
-  "Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
-    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-      the names of its contributors may be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-  .
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-  -
-  On Debian systems, the full text of the GNU Lesser General Public License
-  version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
- Comment: LICENSE.txt is copy of LGPL-2.1
-  The license information of this file is twice the lines of code. :/
+ 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

-- 
marble packaging

