[SCM] qtgraphicaleffects packaging branch, kubuntu_unstable, updated. debian/5.5.0-1
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Tue Sep 8 15:56:26 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtgraphicaleffects.git;a=commitdiff;h=33a459c
The following commit has been merged in the kubuntu_unstable branch:
commit 33a459c36f97c8dff5379d9cdaa23c662735d992
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Aug 29 21:28:48 2015 +0300
Update debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 25 +++++++++++++------------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ed05fa3..9290982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtgraphicaleffects-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
* Do not attempt to run tests during arch-indep builds.
* Do not hardcode libqt5qml5 dependency, let it be handled via
${shlibs:Depends}.
+ * Update debian/copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 29 Aug 2015 20:33:17 +0300
diff --git a/debian/copyright b/debian/copyright
index 2ad12dc..f0bc91a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: qtgraphicaleffects-opensource-src
Source: https://download.qt.io/official_releases/qt/*/submodules/
Files: *
-Copyright: 2013-2014 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
License: BSD-3-clause
Files: debian/*
@@ -23,14 +23,14 @@ Files: tools/pngdumper/*
tests/system/auto/imagecompare.h
tests/system/auto/main.cpp
tests/auto/tst_qtgraphicaleffects.cpp
-Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
Files: tools/pngdumper/*.qml
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
License: BSD-3-clause
-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
@@ -39,16 +39,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
@@ -82,7 +83,7 @@ License: LGPL-2.1
`/usr/share/common-licenses/LGPL-2.1`,
Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
License: GFDL-NIV-1.3
License: GFDL-NIV-1.3
@@ -109,8 +110,8 @@ 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
+ * Neither the name of The Qt Company Ltd 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
--
qtgraphicaleffects packaging
More information about the pkg-kde-commits
mailing list