[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.2-3-7-g0b082ad

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Dec 7 15:06:39 UTC 2017


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

The following commit has been merged in the experimental branch:
commit 0b082ad79080a5a1469dd501b90843d6f6d630fd
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Dec 7 18:05:57 2017 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 60a6f03..fd24580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtdeclarative-opensource-src (5.10.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.10.0.
   * Use dh_auto_configure provided by debhelper.
   * Refresh patches for the new release.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 16:37:42 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 38e8d15..0b8d221 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: qtdeclarative-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2016 The Qt Company Ltd.
+Copyright: 2016-2017 The Qt Company Ltd.
 License: LGPL-3 or GPL-2+
 
 Files: debian/*
@@ -13,7 +13,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-           2013-2016 Dmitry Shachnev <mitya57 at debian.org>
+           2013-2017 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-3 or GPL-2+
 
 Files: *.qdoc
@@ -76,7 +76,7 @@ Files: examples/*
        tests/testapplications/listview/viewTransitions.qml
        tools/qml/conf/configuration.qml
        tools/qml/conf/qtquick.qml
-Copyright: 2015-2016 The Qt Company Ltd.
+Copyright: 2016-2017 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: examples/quick/demos/samegame/content/SamegameText.qml
@@ -345,10 +345,24 @@ Copyright: 2016 Rolland Dudemaine
            2016 The Qt Company Ltd.
 License: LGPL-3 or GPL-2+
 
-Files: src/qml/qml/qqmlimport.cpp
+Files: src/qml/jsruntime/qv4objectproto.cpp
+       src/qml/qml/qqmlimport.cpp
+       src/qmltest/quicktestresult.cpp
 Copyright: 2017 Crimson AS <info at crimson.no>
+           2016 The Qt Company Ltd.
 License: LGPL-3 or GPL-2+
 
+Files: examples/quick/shared/LauncherList.qml
+Copyright: 2017 Crimson AS <info at crimson.no>
+           2017 The Qt Company Ltd.
+License: BSD-3-clause
+
+Files: tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+       tests/auto/qmltest/selftests/tst_grabImage.qml
+Copyright: 2017 Crimson AS <info at crimson.no>
+           2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
 Files: src/3rdparty/masm/yarr/*
 Copyright: 2009-2013 Apple Inc.
            2010 Peter Varga <pvarga at inf.u-szeged.hu>, University of Szeged
@@ -364,16 +378,13 @@ Copyright: 1998 Netscape Communications Corporation
 License: MPL-1.1 and GPL-2+ and LGPL-2.1
 
 License: GFDL-NIV-1.3
- GNU Free Documentation License Usage
- Alternatively, this file may be used under the terms of the GNU Free
- Documentation License version 1.3 as published by the Free Software
- Foundation and appearing in the file included in the packaging of
- this file.  Please review the following information to ensure
- the GNU Free Documentation License version 1.3 requirements
- will be met: http://www.gnu.org/copyleft/fdl.html.
- .
- On Debian systems, the complete text of the GFDL-1.3 license can be found in
- `/usr/share/common-licenses/GFDL-1.3`,
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
 
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list