[SCM] qtsvg packaging branch, master, updated. 52733f46db908371a2ba7a63f60c394864903498
Timo Jyrinki
timo at alioth.debian.org
Fri Mar 1 07:00:59 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsvg.git;a=commitdiff;h=e40f968
The following commit has been merged in the master branch:
commit e40f968882234d8c37f4851ac5031c9fe52c1dca
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Fri Mar 1 06:54:45 2013 +0000
A review of debian/copyright with the 5.0.1 sources
---
debian/copyright | 107 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 30 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index b67edec..0b2b0c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,8 @@ Upstream-Name: qtsvg-opensource-src
Source: http://releases.qt-project.org/qt5/5.0.1/submodules_tar/
Files: *
-Copyright: 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- 1994-2008 Trolltech ASA.
-License: LGPL-2.1 with Nokia Qt LGPL exception or GPL-3
+Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1 with Digia Qt LGPL exception or GPL-3
Files: debian/*
Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -16,36 +15,33 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
License: LGPL-2.1
-License: LGPL-2.1 with Nokia Qt LGPL exception
- GNU Lesser General Public License Usage
+License: LGPL-2.1 with Digia Qt LGPL 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.
.
- Alternatively, 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, Nokia gives you certain
- additional rights. These rights are described in the Nokia Qt LGPL
- Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
- package.
+ 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 LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
- .
- Nokia Qt LGPL Exception version 1.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`.
.
+ 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.
+ (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.
.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
@@ -81,10 +77,42 @@ License: LGPL-2.1
On Debian systems, the complete text of the LGPL-2.1 license can be found in
`/usr/share/common-licenses/LGPL-2.1`,
+Files: src/svg/qtsvgglobal.h
+Copyright: 2012 Intel Corporation
+License: LGPL-2.1 with Digia Qt LGPL exception or GPL-3
+
+Files: src/svg/qsvghandler.cpp src/svg/doc/src/svglicense.qdoc
+Copyright: 2002 USC/Information Sciences Institute
+ 2012 Digia Plc and/or its subsidiary(-ies).
+License: Mixed BSD and LGPL-2.1 with Digia Qt LGPL exception
+ A portion of the files are LGPL-2.1 with Digia Qt LGPL exception or
+ GPL-3, as described above. However, the portion of the files copyright
+ USC/Information Sciences Institute is BSD licensed:
+ .
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of
+ Information Sciences Institute not be used in advertising or
+ publicity pertaining to distribution of the software without
+ specific, written prior permission. Information Sciences Institute
+ makes no representations about the suitability of this software for
+ any purpose. It is provided "as is" without express or implied
+ warranty.
+ .
+ INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD
+ TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES
+ INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
-Files: examples/*
-Copyright: 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
- 1994-2008 Trolltech ASA.
+Files: examples/* src/svg/doc/snippets/*
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+ 2007 Ariya Hidayat
License: BSD
You may use this file under the terms of the BSD license as follows:
.
@@ -97,7 +125,7 @@ License: BSD
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
- * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ * Neither the name of Digia Corporation 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.
@@ -114,3 +142,22 @@ License: BSD
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+Files: examples/svg/embedded/fluidlauncher/fluidlauncher.h examples/svg/embedded/fluidlauncher/slideshow.cpp examples/svg/embedded/fluidlauncher/demoapplication.h examples/svg/embedded/fluidlauncher/fluidlauncher.cpp examples/svg/embedded/fluidlauncher/demoapplication.cpp examples/svg/embedded/fluidlauncher/slideshow.h examples/svg/embedded/fluidlauncher/main.cpp examples/svg/embedded/weatherinfo/weatherinfo.cpp examples/svg/embedded/desktopservices/linktab.h examples/svg/embedded/desktopservices/linktab.cpp examples/svg/embedded/desktopservices/contenttab.cpp examples/svg/embedded/desktopservices/contenttab.h examples/svg/embedded/desktopservices/desktopwidget.h examples/svg/embedded/desktopservices/desktopwidget.cpp examples/svg/embedded/desktopservices/main.cpp examples/svg/embeddedsvgviewer/embeddedsvgviewer.h examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp examples/svg/embeddedsvgviewer/main.cpp
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: LGPL-2.1 with Digia Qt LGPL exception or GPL-3
+
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
+License: GFDL-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`,
--
qtsvg packaging
More information about the pkg-kde-commits
mailing list