[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.4.2-6-4-g26ed281

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Aug 13 21:42:05 UTC 2015 

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

The following commit has been merged in the experimental branch:
commit 26ed281527a97d1b9a298989ede7786f39157ac4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Aug 14 00:41:53 2015 +0300

    Update debian/copyright for the new version.
---
 debian/changelog |   1 +
 debian/copyright | 129 +++++++++++++++++++++----------------------------------
 2 files changed, 50 insertions(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d58e461..c5f6522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtdeclarative-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.5.0.
   * Drop avoid_calling_potentially_pure-virtual_method.patch, applied upstream.
   * Refresh check_system_double-conversion.patch.
+  * Update debian/copyright for the new version.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 13 Aug 2015 23:28:53 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 0c4f994..8539ba1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,10 @@ Upstream-Name: qtdeclarative-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015 The Qt Company Ltd.
+           2010-2013 Research In Motion.
+           2013-2014 Jolla Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -15,11 +15,10 @@ 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-2014 Dmitry Shachnev <mitya57 at debian.org>
+           2013-2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-Files: src/3rdparty/masm/assembler/*
-       src/3rdparty/masm/disassembler/*
+Files: src/3rdparty/masm/disassembler/*
        src/3rdparty/masm/jit/JITCompilationEffort.h
        src/3rdparty/masm/wtf/FilePrintStream.cpp
        src/3rdparty/masm/runtime/MatchResult.h
@@ -39,23 +38,28 @@ Copyright: 2009-2013 Apple Inc.
            2010 Peter Varga <pvarga at inf.u-szeged.hu>, University of Szeged
 License: BSD-2-clause
 
+Files: src/3rdparty/masm/assembler/*
+Copyright: 2008-2013 Apple Inc.
+           2009-2010 University of Szeged
+License: BSD-2-clause
+
 Files: src/3rdparty/double-conversion/*
 Copyright: 2012 the V8 project authors
 License: BSD-3-clause
 
+Files: src/imports/statemachine/*
+       tests/auto/qmltest/statemachine/*
+Copyright: 2014 Ford Motor Company
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/qml/doc/snippets/qml/statemachine/*
+Copyright: 2014 Ford Motor Company
+License: BSD-3-clause
+
 Files: examples/*
  src/qml/doc/snippets/*
  src/quick/doc/snippets/*
- tests/auto/qmltest/listview/tst_listview.qml
- tests/auto/qmltest/image/tst_image.qml
- tests/auto/qmltest/text/tst_text.qml
- tests/auto/qmltest/animatedimage/tst_animatedimage.qml
- tests/auto/qmltest/gradient/tst_gradient.qml
- tests/auto/qmltest/textinput/tst_textinput.qml
- tests/auto/qmltest/rectangle/tst_rectangle.qml
- tests/auto/qmltest/textedit/tst_textedit.qml
- tests/auto/qmltest/listmodel/tst_listmodel.qml
- tests/auto/qmltest/fontloader/tst_fontloader.qml
+ tests/auto/qmltest/*
  tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
  tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
  tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
@@ -65,27 +69,9 @@ Files: examples/*
  tests/testapplications/listview/viewTransitions.qml
  tests/testapplications/animatedsprite/animatedsprite.qml
  tests/testapplications/animatedsprite/animatedspriteadvance.qml
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
-License: BSD-3-clause
-
-Files: examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
- examples/quick/customitems/painteditem/textballoon.cpp
- examples/quick/customitems/painteditem/textballoon.h
- examples/quick/scenegraph/*
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-           2013 Jolla Ltd.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
-
-Files: examples/quick/demos/stocqt/content/CheckBox.qml
- examples/quick/demos/samegame/content/SamegameText.qml
-Copyright: 2012 Research In Motion
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
-Files: tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
- tests/benchmarks/qml/qquickwindow/tst_qquickwindow.cpp
-Copyright: 2012 Research In Motion
-License: LGPL-2.1-or-3 with Digia-1.1 exception
-
 Files: tests/auto/qml/parserstress/tests/*
 Copyright: 1998-2003 Netscape Communications Corporation
            2005-2007 Mozilla Foundation
@@ -93,9 +79,9 @@ License: LGPL-2.1
 
 Files: src/qml/qml/qqmllocale.cpp
 Copyright: 1991 AT&T
-           2012 Digia Plc and/or its subsidiary(-ies).
+           2012 The Qt Company Ltd.
 License: custom-qqmllocale
- A portion of the file is LGPL-2.1-or-3 with Digia-1.1 exception.
+ A portion of the file is LGPL-2.1-or-3 with Qt-1.1 exception.
  A portion is however BSD licensed:
  .
  Permission to use, copy, modify, and distribute this software for any
@@ -112,20 +98,29 @@ License: custom-qqmllocale
  This product includes software developed by the University of
  California, Berkeley and its contributors.
 
-Files: src/qml/animations/*
-       tests/auto/quick/qquickanimations/*
-Copyright: 2014 Jolla Ltd.
-License: LGPL-2.1-or-3 with Digia-1.1 exception
-
-
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: tests/auto/qml/parserstress/tests/ecma*
 Copyright: 1998 Netscape Communications Corporation
 License: MPL-1.1 and GPL-2+ and LGPL-2.1
 
+Files: examples/quick/scenegraph/twotextureproviders/*
+       src/quick/doc/snippets/qml/opacitymask.qml
+       src/quick/doc/snippets/qml/layerblending.qml
+       src/quick/doc/snippets/qml/layerwitheffect.qml
+Copyright: 2014 Gunnar Sletta <gunnar at sletta.org>
+License: BSD-3-clause
+
+Files: tools/qmllint/*
+       src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
+       src/quick/scenegraph/coreapi/qsgnode_p.h
+       src/quick/scenegraph/util/qsgshadersourcebuilder.cpp
+       src/quick/scenegraph/util/qsgshadersourcebuilder_p.h
+Copyright: 2013-2014 Klaralvdalens Datakonsult AB (KDAB).
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
 License: GFDL-NIV-1.3
  GNU Free Documentation License Usage
  Alternatively, this file may be used under the terms of the GNU Free
@@ -172,9 +167,9 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Digia Plc 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.
+   * Neither the name of The Qt Company Ltd 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
@@ -200,7 +195,7 @@ License: LGPL-2.1
  On Debian systems, the complete text of the GNU Lesser General Public License
  can be found in `/usr/share/common-licenses/LGPL-2.1`.
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
  GNU Lesser General Public License:
  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
@@ -209,16 +204,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  information to ensure the GNU Lesser General Public License requirements
  will be met: https://www.gnu.org/licenses/lgpl.html.
  .
- In addition, as a special exception, Digia gives you certain additional
- rights. These rights are described in the Digia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ In addition, as a special exception, The Qt Company gives you certain
+ additional rights. These rights are described in The Qt Company Qt LGPL
+ Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+ package.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
  The complete text of the GNU Lesser General Public License version 3 can be
  found in `/usr/share/common-licenses/LGPL-3`.
  .
- Digia Qt LGPL Exception version 1.1:
+ The Qt Company LGPL Exception version 1.1:
  As an additional permission to the GNU Lesser General Public License version
  2.1, the object code form of a "work that uses the Library" may incorporate
  material from a header file that is part of the Library.  You may distribute
@@ -240,17 +236,6 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-License: LGPL-2.1
- This file may be used under the terms of the GNU Lesser
- General Public License version 2.1 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPL included in the
- packaging of this file.  Please review the following information to
- ensure the GNU Lesser General Public License version 2.1 requirements
- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`.
-
 License: MPL-1.1
                           MOZILLA PUBLIC LICENSE
                                 Version 1.1
@@ -736,19 +721,3 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-- 
qtdeclarative packaging

More information about the pkg-kde-commits mailing list