[SCM] marble packaging branch, master, updated. debian/16.08.3-1-154-g84802f6
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Nov 21 15:11:47 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=3c79301
The following commit has been merged in the master branch:
commit 3c79301417d19b015c5c7774776d5a78f5de0342
Merge: d923ddd6906e13c8a3183b5b6deeda234fcba920 187035d9c1da7e00386c4a19e8b4a13797b7e579
Author: Jonathan Riddell <jr at jriddell.org>
Date: Thu Jul 7 11:27:38 2016 +0100
merge neon/stable
debian/copyright | 31 +++++++++++++++++++++++++++++++
debian/marble-data.install | 1 -
debian/marble-plugins.lintian-overrides | 2 ++
debian/marble.install | 5 +++++
debian/not-installed | 19 +------------------
5 files changed, 39 insertions(+), 19 deletions(-)
diff --cc debian/copyright
index 5722582,e3e8322..2eb0e2f
--- a/debian/copyright
+++ b/debian/copyright
@@@ -2751,83 -2255,94 +2751,114 @@@ Copyright: 2010, Christian Vetter <veaa
2007, Free Software Foundation, Inc. <http://fsf.org/>
License: GPL-3+
++<<<<<<< HEAD
+Files: src/lib/marble/MarbleZip.cpp
+ src/lib/marble/MarbleZipReader.h
+ src/lib/marble/MarbleZipWriter.h
+Copyright: 2015, The Qt Company Ltd
+License: GPL-3_or_LGPL-2.1+3
+ $QT_BEGIN_LICENSE:LGPL$
+ Commercial License Usage
+ Licensees holding valid commercial Qt licenses may use this file in
+ accordance with the commercial license agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and The Qt Company. For licensing terms
+ and conditions see http://www.qt.io/terms-conditions. For further
+ information use the contact form at http://www.qt.io/contact-us.
+ .
+ GNU Lesser General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 or version 3 as published by the Free
+ Software Foundation and appearing in the file LICENSE.LGPLv21 and
+ LICENSE.LGPLv3 included in the packaging of this file. Please review the
+ following information to ensure the GNU Lesser General Public License
+ requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ As a special exception, The Qt Company gives you certain additional
+ rights. These rights are described in The Qt Company LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ .
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.
+ .
+ $QT_END_LICENSE$
+ .
+ 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', likewise, the full
+ text of the GNU Lesser General Public version 3 can be found in the file
+ `/usr/share/common-licenses/LGPL-3', also, the full text of the GNU General
+ Public License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
++=======
+ Files: COPYING.DOC
+ docs/bindings/python/html/common/fdl-license
+ docs/bindings/python/html/common/fdl-license.html
+ Copyright: 2000-2002, Free Software Foundation, Inc
+ License: GFDL-NIV-1.2
+ This can be found at /usr/share/common-licenses/GFDL-1.2
++>>>>>>> Neon/stable
Files: tools/osm-addresses/pbf/fileformat.proto
tools/osm-addresses/pbf/osmformat.proto
Copyright: 2010, Scott A. Crosby <scott at sacrosby.com>
License: LGPL-3+
++<<<<<<< HEAD
+ 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
+ License, or (at your option) any later version.
++=======
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of
+ the License, or (at your option) any later version.
++>>>>>>> Neon/stable
.
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
++<<<<<<< HEAD
+ 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'.
++=======
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
++>>>>>>> Neon/stable
Files: data/mwdbii/MWDBPOLY.TXT
data/mwdbii/contents.txt
Copyright: no copyright claimed
License: public-domain
++<<<<<<< HEAD
+ The MICRO WORLD DATA BANK II Database was was produced and placed in the
+ Public Domain by Fred Pospeschil and Antonio Rivera.
++=======
+ The MWDB-POLY database is released to the Public Domain
++>>>>>>> Neon/stable
-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
License: Apache-2.0
++<<<<<<< HEAD
+ Licensed under the Apache License v2.0
+ http://www.apache.org/licenses/LICENSE-2.0
++=======
+ This can be found at /usr/share/common-licenses/Apache-2.0
++>>>>>>> Neon/stable
Files: debian/*
Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
--
marble packaging
More information about the pkg-kde-commits
mailing list