[SCM] qbs packaging branch, master, updated. debian/1.6.1+dfsg-1-9-g17347ab
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Dec 23 14:43:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=17347ab
The following commit has been merged in the master branch:
commit 17347ab81643cd2fd0590d3ca5ba7add467e2d6e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Dec 23 17:42:29 2016 +0300
Update debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 136 +++++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 119 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ec08625..9c0a2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
qbs (1.7.0+dfsg-2) UNRELEASED; urgency=medium
* Drop ${shlibs:Depends} from qbs-dev, it does not have any binary code.
+ * Update debian/copyright.
-- Dmitry Shachnev <mitya57 at debian.org> Fri, 23 Dec 2016 12:49:42 +0300
diff --git a/debian/copyright b/debian/copyright
index e4ac60b..f650856 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,41 +4,80 @@ Source: https://download.qt.io/official_releases/qbs/
Files-Excluded: doc/templates/scripts/jquery.js
Files: *
-Copyright: 2015, The Qt Company Ltd.
+Copyright: 2015-2016, The Qt Company Ltd.
2015, Jake Petroules
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+License: LGPL-3 or GPL-2
-Files: src/lib/corelib/jsextensions/domxml.*
+Files: src/lib/corelib/jsextensions/domxml.h
Copyright: 2015, BogDan Vatra <bogdan at kde.org>
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+License: LGPL-3 or GPL-2
Files: 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
+License: LGPL-3 or GPL-2, and Expat
-Files: examples/cocoa-application/*
- examples/cocoa-touch-application/*
- src/lib/corelib/jsextensions/propertylist.*
+Files: src/lib/corelib/jsextensions/propertylist.*
+ src/lib/corelib/jsextensions/propertylistutils.*
src/lib/corelib/tools/architectures.cpp
src/lib/corelib/tools/shellutils.*
Copyright: 2015, The Qt Company Ltd.
+ 2014-2015, Petroules Corporation
+License: LGPL-3 or GPL-2
+
+Files: examples/*
+Copyright: 2016, The Qt Company Ltd.
+License: BSD-3-clause
+
+Files: examples/*.h
+Copyright: 2016, The Qt Company Ltd.
+ 2015, Petroules Corporation
+License: LGPL-3 or GPL-2
+
+Files: doc/reference/items/language/group.qbs
+ examples/*.m
+ share/*
+ src/lib/corelib/generators/visualstudio/*
+ src/lib/corelib/language/testdata/jsextensions.js
+ src/lib/qtprofilesetup/templates/*.js
+Copyright: 2015-2016, The Qt Company Ltd.
2015, Petroules Corporation
+ 2015, Jake Petroules
License: LGPL-2.1-or-3 with Qt-1.1 exception
+Files: share/qbs/modules/bundle/update-specs.sh
+Copyright: 2016, The Qt Company Ltd.
+License: LGPL-3 or GPL-2
+
+Files: tests/*
+Copyright: 2016, The Qt Company Ltd.
+ 2015, Jake Petroules
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/auto/blackbox/tst_clangdb.cpp
+Copyright: 2016, The Qt Company Ltd.
+ 2016, Christian Gagneraud
+License: GPL-3 with Qt-1.0 exception
+
Files: 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/*
+Files: tests/auto/blackbox/testdata/dynamicRuleOutputs/*
+ tests/auto/blackbox/testdata/loadablemodule/main.cpp
Copyright: 2015, The Qt Company Ltd.
+ 2015, Jake Petroules
License: BSD-3-clause
+Files: *.qdoc
+Copyright: 2015, Jake Petroules
+ 2015, Petroules Corporation
+ 2016, The Qt Company Ltd.
+License: GFDL-NIV-1.3
+
Files: debian/*
-Copyright: 2014-2015, Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1+
+Copyright: 2014-2016, Dmitry Shachnev <mitya57 at debian.org>
+License: LGPL-3 or GPL-2
License: LGPL-2.1-or-3 with Qt-1.1 exception
GNU Lesser General Public License:
@@ -81,13 +120,65 @@ License: LGPL-2.1-or-3 with Qt-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 as published by the Free Software Foundation, either version 2.1
- of the License, or (at your opinion) any later version.
+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 Lesser General Public License for more details.
.
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 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 version 2 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 complete text of the GNU General Public
+ License version 2 can be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-3 with Qt-1.0 exception
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU 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 complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3.
+ .
+ The Qt Company GPL Exception 1.0
+ Exception 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.
+ .
+ Exception 2:
+ .
+ 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: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -134,3 +225,12 @@ License: BSD-3-clause
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: GFDL-NIV-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.
--
qbs packaging
More information about the pkg-kde-commits
mailing list