[SCM] qtcreator packaging branch, master, updated. debian/3.6.1-1-11-g86f55f4
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Tue May 24 00:39:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=86f55f4
The following commit has been merged in the master branch:
commit 86f55f416b5ec578b0e5ca026fbf1fcc8e0f402f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon May 23 21:39:37 2016 -0300
Update debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 328 +++++++++++++++++++++++++++++--------------------------
2 files changed, 174 insertions(+), 155 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 76238de..270f058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtcreator (4.0.0-1) UNRELEASED; urgency=medium
* Refresh botan_system_lib.diff.
* Add qmlscene and qt5-qmltooling-plugins as a qtcreator recommendations
(Closes: #824334).
+ * Update debian/copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 11 May 2016 14:59:38 -0300
diff --git a/debian/copyright b/debian/copyright
index bb7aa6c..4ef84a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,185 +3,183 @@ Source: http://download.qt.io/official_releases/qtcreator/*/*/
Files: *
Copyright:
- 2012 Digia Plc and/or its subsidiary(-ies)
- 2014 Andre Hartmann <aha_1980 at gmx.de>
- 2014 Orgad Shaneh <orgads at gmail.com>
- 2014 Petar Perisin <petar.perisin at gmail.com>
- 2014 Konstantin Tokarev <annulen at yandex.ru>
- 2014 Petroules Corporation
- 2014 BogDan Vatra <bogdan at kde.org>
- 2014 Hugues Delorme
- 2014 Brian McGillion
- 2014 Axonian LLC.
- 2014 Kläralvdalens Datakonsult AB, a KDAB Group company.
- 2012-2014 BlackBerry Limited (a.k.a. Research In Motion)
- 2014 Denis Mingulov
- 2014 Lukas Holecek <hluk at email.cz>
- 2014 Vasiliy Sorokin
- 2014 Dmitry Savchenko
- 2014 Openismus GmbH.
- 2014 Przemyslaw Gorszkowski <pgorszkowski at gmail.com>
- 2014 Nicolas Arnaud-Cormos
- 2014 Tim Sander <tim at krieglstein.org>
-License: LGPL-2.1+ with Digia exception
-
-Files: debian/*
-Copyright:
- 2009-2013 Adam Majer <adamm at zombino.com>
- 2009-2013 Fathi Boudra <fabo at debian.org>
- 2009-2013 Jeremy Lainé <jeremy.laine at m4x.org>
- 2009-2013 Jonathan Riddell <jriddell at ubuntu.com>
- 2013-2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-License: LGPL-2.1+
+ 2002-2009 Julian Seward et al.
+ 2005 Roberto Raggi <roberto at kdevelop.org>
+ 2015-2016 The Qt Company Ltd.
+ 2016 Andre Hartmann <aha_1980 at gmx.de>
+ 2016 AudioCodes Ltd.
+ 2016 Axonian LLC.
+ 2016 BlackBerry Limited
+ 2016 BogDan Vatra <bog_dan_ro at yahoo.com>
+ 2016 Brian McGillion
+ 2016 Canonical Ltd.
+ 2016 Denis Mingulov
+ 2016 Denis Shienkov <denis.shienkov at gmail.com>
+ 2016 Digia Plc and/or its subsidiary(-ies)
+ 2016 Dmitry Savchenko
+ 2016 Falko Arps
+ 2016 Giuliano Schneider
+ 2016 Hugues Delorme
+ 2016 Jan Dalheimer <jan at dalheimer.de>
+ 2016 Jochen Becher
+ 2016 Kläralvdalens Datakonsult AB, a KDAB Group company
+ 2016 Konstantin Tokarev <annulen at yandex.ru>
+ 2016 Lorenz Haas
+ 2016 Lukas Holecek <hluk at email.cz>
+ 2016 Nicolas Arnaud-Cormos
+ 2016 nsf <no.smile.face at gmail.com>
+ 2016 Openismus GmbH.
+ 2016 Orgad Shaneh <orgads at gmail.com>
+ 2016 Petar Perisin <petar.perisin at gmail.com>
+ 2016 Przemyslaw Gorszkowski <pgorszkowski at gmail.com>
+ 2016 Research In Motion
+ 2016 Sven Klein
+ 2016 Thorben Kroeger <thorbenkroeger at gmail.com>
+ 2016 Tim Sander <tim at krieglstein.org>
+ 2016 Vasiliy Sorokin
+License: GPL-3+ with The Qt Company GPL exception 1.0
-Files: src/shared/qbs/doc/templates/scripts/superfish.js
-Copyright: 2008 Joel Birch
-License: MIT or GPL-2
+Files:
+ doc/titlecase/*
+ share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/threejs/3rdparty/three.js
+ src/libs/3rdparty/cplusplus/*
+ src/libs/3rdparty/sqlite/okapi_bm25.h
+ src/tools/3rdparty/cplusplus-keywordgen
+Copyright:
+ 2008-2014 David Gouch
+ 2008-2014 Fawzi Mohamed
+ Pasi keränen <pasi.keranen at theqtcompany.com>
+ 2008 Roberto Raggi <roberto.raggi at gmail.com>
+ 2016 The Qt Company Ltd.
+ 2014 Joshua Wilson
+License: MIT
Files:
- doc/examples/addressbook-sdk/part1/main.cpp
- doc/examples/addressbook-sdk/part1/addressbook.cpp
- doc/examples/addressbook-sdk/part1/addressbook.h
- doc/examples/addressbook-sdk/part6/finddialog.h
- doc/examples/addressbook-sdk/part6/finddialog.cpp
- doc/examples/addressbook-sdk/part6/main.cpp
- doc/examples/addressbook-sdk/part6/addressbook.cpp
- doc/examples/addressbook-sdk/part6/addressbook.h
- doc/examples/addressbook-sdk/part5/finddialog.h
- doc/examples/addressbook-sdk/part5/finddialog.cpp
- doc/examples/addressbook-sdk/part5/main.cpp
- doc/examples/addressbook-sdk/part5/addressbook.cpp
- doc/examples/addressbook-sdk/part5/addressbook.h
- doc/examples/addressbook-sdk/part4/main.cpp
- doc/examples/addressbook-sdk/part4/addressbook.cpp
- doc/examples/addressbook-sdk/part4/addressbook.h
- doc/examples/addressbook-sdk/part3/main.cpp
- doc/examples/addressbook-sdk/part3/addressbook.cpp
- doc/examples/addressbook-sdk/part3/addressbook.h
- doc/examples/addressbook-sdk/part2/main.cpp
- doc/examples/addressbook-sdk/part2/addressbook.cpp
- doc/examples/addressbook-sdk/part2/addressbook.h
- doc/examples/addressbook-sdk/part7/finddialog.h
- doc/examples/addressbook-sdk/part7/finddialog.cpp
- doc/examples/addressbook-sdk/part7/main.cpp
- doc/examples/addressbook-sdk/part7/addressbook.cpp
- doc/examples/addressbook-sdk/part7/addressbook.h
- doc/examples/batterystatus/main.cpp
+ doc/examples/uiforms/main.cpp
doc/examples/textfinder/textfinder.cpp
doc/examples/textfinder/main.cpp
doc/examples/textfinder/textfinder.h
- scripts/unixdeployqt.sh
+ doc/examples/accelbubble/main.cpp
scripts/deployqt.py
- scripts/dependencyinfo.py
- scripts/packageIfw.py
+ tests/auto/qml/codemodel/importscheck/007_compositeQmlCopyAndCppAndQml/QtQuick/Controls/Private/style.js
+ tests/auto/qml/codemodel/importscheck/005_compositeQmlCopyAndCpp/QtQuick/Controls/Private/style.js
+ tests/auto/qml/codemodel/importscheck/002_nestedQmlOnly/QtGraphicalEffects/*
+ tests/auto/qml/codemodel/importscheck/005_compositeQmlCopyAndCpp/QtQuick/*
+ tests/auto/qml/codemodel/importscheck/007_compositeQmlCopyAndCppAndQml/QtQuick/Controls/*
+ tests/auto/qml/codemodel/importscheck/003_packageQmlOnly/QtGraphicalEffects/*
+ tests/auto/qml/codemodel/importscheck/001i_flatQmlOnly/GaussianDirectionalBlur.qml
src/plugins/imageviewer/imageview.h
src/plugins/imageviewer/imageview.cpp
-Copyright: 2014 Digia Plc and/or its subsidiary(-ies).
-License: BSD-3-clause
-
-Files: tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
- src/shared/qbs/doc/templates/scripts/jquery.js
- doc/templates/scripts/jquery.js
- doc/titlecase/jquery.js
+ src/shared/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/flexoptionsreader.js: BSD (3 clause)
+ src/shared/tests/auto/blackbox/testdata/dbus-interfaces/main.cpp
+ src/shared/tests/auto/blackbox/testdata/dbus-interfaces/controller.*
+ src/shared/tests/auto/blackbox/testdata/dbus-adaptors/*
+ src/shared/tests/auto/blackbox/testdata/loadablemodule/main.cpp
Copyright:
- 2011 John Resig
- 2011 The Dojo Foundation
-License: GPL-2 or MIT
-
-Files: src/libs/3rdparty/cplusplus/*
-Copyright:
- 2008 Roberto Raggi <roberto.raggi at gmail.com>
-License: BSD-3-clause
-
-Files: src/libs/zeroconf/*
-Copyright: 1997-2004, Apple Computer, Inc.
+ 2016 The Qt Company Ltd.
+ 2016 Denis Mingulov
+ 2015 Jake Petroules
License: BSD-3-clause
Files: src/libs/3rdparty/botan/*
-Copyright:
- 1999-2011 Jack Lloyd
- 2001 Peter J Jones
- 2004-2007 Justin Karneges
- 2004 Vaclav Ovsik
- 2005 Matthew Gregan
- 2005-2006 Matt Johnston
- 2006 Luca Piccarreta
- 2007 Yves Jerschow
- 2007-2008 FlexSecure GmbH
- 2007-2008 Technische Universitat Darmstadt
- 2007-2008 Falko Strenzke
- 2007-2008 Martin Doering
- 2007 Manuel Hartl
- 2007 Christoph Ludwig
- 2007 Patrick Sona
- 2010 Olivier de Gaalon
+Copyright: 1999-2011 Jack Lloyd
License: BSD-2-clause
-Files: src/tools/3rdparty/iossim/*
+Files: src/libs/3rdparty/sqlite/*
+Copyright: D. Richard Hipp <drh at hwaci.com>
+License: public-domain
+ The files listed have been put on the public domain by the sqlite3
+ contributors.
+
+Files: src/share/3rdparty/generic-highlighter/*
Copyright:
- 2008-2011 Plausible Labs Cooperative, Inc.
- Jeff Haynie, Appcelerator, Inc.
- https://github.com/hborders
- http://pivotallabs.com/users/scoward/blog
- Eloy Duran, Fingertips <eloy at fngtps.com>
- Fawzi Mohamed, digia <fawzi.mohamed at digia.com>
+ 2004 by Dominik Haumann
+ 2004 Alexander Neundorf <neundorf at kde.org>
+ 2005 Dominik Haumann <dhdev at gmx.de>
+ 2007,2008,2013,2014 Matthew Woehlke <mw_triad at users.sourceforge.net>
+ 2013-2015 Alex Turbov <i.zaufi at gmail.com>
+ 2007 Matthew Woehlke <mw_triad at users.sourceforge.net>
+ 2001-2004 Anders Lund <anders at alweb.dk>
+ 2004 Sebastian Vuorinen <sebastian dot vuorinen at helsinki dot fi>
+ 2004 Stefan Lang (langstefan at gmx.at)
+ 2008 Robin Pedersen (robinpeder at gmail.com)
+ 2011 Miquel Sabaté (mikisabate at gmail.com)
+ 2004 Jan Villat <jan.villat at net2000.ch>
+License: LGPL2+
+
+Files: src/shared/qbs/*
+Copyright: 2015, The Qt Company Ltd.
+ 2015, Jake Petroules
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/shared/qbs/src/lib/corelib/jsextensions/domxml.*
+Copyright: 2015, BogDan Vatra <bogdan at kde.org>
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/shared/qbs/src/plugins/scanner/cpp/*
+Copyright: 2015, The Qt Company Ltd.
+ 2008, Roberto Raggi <roberto.raggi at gmail.com>
+License: LGPL-2.1-or-3 with Qt-1.1 exception and Expat
+
+Files: src/shared/qbs/examples/cocoa-application/*
+ src/shared/qbs/examples/cocoa-touch-application/*
+ src/shared/qbs/src/lib/corelib/jsextensions/propertylist.*
+ src/shared/qbs/src/lib/corelib/tools/architectures.cpp
+ src/shared/qbs/src/lib/corelib/tools/shellutils.*
+Copyright: 2015, The Qt Company Ltd.
+ 2015, Petroules Corporation
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/shared/qbs/doc/templates/scripts/superfish.js
+Copyright: 2008, Joel Birch <joeldbirch at gmail.com>
+License: Expat
+
+Files: examples/*.qbs
+ examples/helloworld-*/*
+ tests/auto/blackbox/testdata/dynamicRuleOutputs/*
+Copyright: 2015, The Qt Company Ltd.
License: BSD-3-clause
-Comment: some entries as described in src/tools/3rdparty/iossim/IOSSIM_LICENSE
-
-License: LGPL-2.1+
- GNU Lesser General Public License version 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.
- .
- 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.
+
+Files:
+ src/tools/3rdparty/iossim*
+Copyright: 2008-2011 Plausible Labs Cooperative, Inc.
+License: Expat
+
+License: GPL-3+ with The Qt Company GPL exception 1.0
+ 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.
.
- 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+ with Digia exception
- GNU Lesser General Public License version 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.
+ 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.
.
- 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.
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-3`.
.
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ The Qt Company GPL Exception 1.0
.
- Digia Qt LGPL Exception version 1.1:
+ Exception 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.
+ As a special exception you may create a larger work which contains the
+ output of this application and distribute that work under terms of your
+ choice, so long as the work is not otherwise derived from or based on
+ this application and so long as the work does not in itself generate
+ output that contains the output from this application in its original
+ or modified form.
.
- 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.
+ Exception 2:
.
- Furthermore, you are not required to apply this additional permission to a
- modified version of the Library.
+ As a special exception, you have permission to combine this application
+ with Plugins licensed under the terms of your choice, to produce an
+ executable, and to copy and distribute the resulting executable under
+ the terms of your choice. However, the executable must be accompanied
+ by a prominent notice offering all users of the executable the entire
+ source code to this application, excluding the source code of the
+ independent modules, but including any changes you have made to this
+ application, under the terms of this license.
License: BSD-3-clause
On Debian systems, the terms of BSD-3-clause license may be found at
@@ -236,3 +234,23 @@ License: MIT
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+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.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list