[SCM] qtlocation packaging branch, master, updated. debian/5.9.2+dfsg-1

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Oct 26 20:53:14 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=c1637f1

The following commit has been merged in the master branch:
commit c1637f1fba21dff5227ddb273704c052e67c966b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Oct 15 12:26:16 2017 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e3103f..b19afd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtlocation-opensource-src (5.9.2+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.9.2.
   * Use Files-Excluded instead of custom repacking code.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 15 Oct 2017 11:54:20 +0300
 
diff --git a/debian/copyright b/debian/copyright
index cca6425..b7f2968 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtlocation-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 Files-Excluded: src/3rdparty/mapbox-gl-native
 
 Files: *
-Copyright: 2015-2016 The Qt Company Ltd.
+Copyright: 2015-2017 The Qt Company Ltd.
            2015-2016 Jolla Ltd.
            2013-2016 Aaron McCarthy <mccarthy.aaron at gmail.com>
 License: LGPL-3 or GPL-2
@@ -16,7 +16,7 @@ License: LGPL-3 or GPL-2
 Files: examples/*
        src/location/doc/snippets/*
        src/positioning/doc/snippets/*
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2015-2017 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: src/3rdparty/clip2tri/*
@@ -27,6 +27,10 @@ Files: src/3rdparty/clipper/*
 Copyright: 2010-2014 Angus Johnson
 License: Boost-1.0
 
+Files: src/3rdparty/earcut/*
+Copyright: 2015 Mapbox
+License: ISC
+
 Files: src/3rdparty/poly2tri/*
 Copyright: 2009-2010, Poly2Tri Contributors
 License: BSD-3-clause
@@ -50,15 +54,18 @@ Copyright: 2016 Aaron McCarthy <mccarthy.aaron at gmail.com>
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
+       tests/plugins/declarativetestplugin/testhelper.h
 Copyright: 2016 The Qt Company Ltd.
 License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: *.qdoc
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2015-2017 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: src/location/doc/src/plugins/mapbox.qdoc
 Copyright: 2014 Canonical Ltd.
+           2017 The Qt Company Ltd.
+           2017 Mapbox, Inc.
 License: GFDL-NIV-1.3
 
 Files: src/location/doc/src/plugins/osm.qdoc
@@ -73,7 +80,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012 Timo Jyrinki <timo.jyrinki at canonical.com>
            2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-           2014-2016 Dmitry Shachnev <mitya57 at debian.org>
+           2014-2017 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-3 or GPL-2
 
 License: LGPL-2.1-or-3 with Qt-1.1 exception
@@ -255,3 +262,16 @@ License: Boost-1.0
  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
+
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.

-- 
qtlocation packaging



More information about the pkg-kde-commits mailing list