[SCM] qtquickcontrols packaging branch, kubuntu_unstable, updated. debian/5.5.0-1-2-g8bfa942

Tue Sep 8 15:55:17 UTC 2015

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

The following commit has been merged in the kubuntu_unstable branch:
commit c95fe4d5a00e0587c07b1e64a2cddd45103addf8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 29 15:33:07 2015 +0300

    Update debian/copyright.
---
 debian/changelog |   1 +
 debian/copyright | 153 ++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 97 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eac6819..65e36ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtquickcontrols-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.5.0.
   * Add new qml-module-qtquick-extras binary package.
   * Do not hardcode libqt5qml5 dependencies.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Aug 2015 14:36:19 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 87638dc..ac24fb2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,8 @@ Upstream-Name: qtquickcontrols-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-           2013 Tasuku Suzuki <stasuku at gmail.com>
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -16,72 +15,112 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
            2013-2014 Dmitry Shachnev <mitya57 at debian.org>
            2013-2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-License: LGPL-2.1
+License: LGPL-3 or GPL-2
 
 Files: examples/*
-       src/layouts/doc/src/snippets/*
-       src/*.qml
        tests/*.qml
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-           2013 Tasuku Suzuki <stasuku at gmail.com>
+       tests/auto/extras/data/TestUtils.js
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
-Comment: including all the qml files inside src/ and tests/ and their
- subdirectories.
 
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+       src/controls/doc/snippets/*.qml
+       src/layouts/doc/src/snippets/*.qml
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
- 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
- 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.
+Files: tests/auto/menubar/*
+Copyright: 2015 The Qt Company Ltd.
+           2015 Cucchetto Filippo <filippocucchetto at gmail.com>
+License: LGPL-3 or GPL-2
+
+Files: examples/quick/extras/dashboard/fonts/DejaVuSans.ttf
+Copyright: 2003 Bitstream, Inc.
+           2006 Tavmjong Bah
+License: bitstream-vera
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute the
+ Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright and trademark notices and this permission notice shall
+ be included in all copies of one or more of the Font Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in particular
+ the designs of glyphs or characters in the Fonts may be modified and
+ additional glyphs or characters may be added to the Fonts, only if the fonts
+ are renamed to names not containing either the words "Bitstream" or the word
+ "Vera".
  .
- 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.
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream
+ Vera" names.
  .
- 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`.
+ The Font Software may be sold as part of a larger software package but no
+ copy of one or more of the Font Software typefaces may be sold by itself.
  .
- Digia Qt 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
- such object code under terms of your choice, provided that:
-     (i)   the header files of the Library have not been modified; and
-     (ii)  the incorporated material is limited to numerical parameters, data
-           structure layouts, accessors, macros, inline functions and
-           templates; and
-     (iii) you comply with the terms of Section 6 of the GNU Lesser General
-           Public License version 2.1.
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+ FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+ FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font Software
+ without prior written authorization from the Gnome Foundation or Bitstream
+ Inc., respectively. For further information, contact: fonts at gnome dot
+ org.
+
+Files: examples/quick/extras/gallery/fonts/OpenSans-Regular.ttf
+       src/extras/Styles/Flat/fonts/OpenSans-*.ttf
+Copyright: Steve Matteson
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
  .
- Moreover, you may apply this exception to a modified version of the Library,
- provided that such modification does not involve copying material from the
- Library into the modified Library's header files unless such material is
- limited to (i) numerical parameters; (ii) data structure layouts;
- (iii) accessors; and (iv) small macros, templates and inline functions of
- five lines or less in length.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
  .
- Furthermore, you are not required to apply this additional permission to a
- modified version of the Library.
+ On Debian systems, the full text of Apache License, Version 2.0 can
+ be found in /usr/share/common-licenses/Apache-2.0.
 
-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.
+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, version 3
+ as published by the Free Software Foundation.
+ .
+ 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 General Public License for more details.
+ .
+ On Debian systems, the full text of GNU Lesser General Public License,
+ version 3 can be found in /usr/share/common-licenses/LGPL-3.
+
+License: GPL-2
+ 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 2 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 General Public License for more details.
  .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
+ On Debian systems, the full text of GNU General Public License,
+ version 2 can be found in /usr/share/common-licenses/GPL-2.
 
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
@@ -95,9 +134,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

-- 
qtquickcontrols packaging

