[SCM] qtimageformats packaging branch, experimental, updated. debian/5.3.2-2-3-ga8261f0
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Dec 23 15:53:50 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtimageformats.git;a=commitdiff;h=a8261f0
The following commit has been merged in the experimental branch:
commit a8261f0f81644f5272d632b0e3400df614185e41
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Dec 23 18:52:55 2014 +0300
Update debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 31 ++++++++++++++++++++-----------
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8995668..70d0c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtimageformats-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
* Build-depend on qtbase 5.4.0.
+ * Update debian/copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 23 Dec 2014 18:25:37 +0300
diff --git a/debian/copyright b/debian/copyright
index ad0386b..19532a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,11 +13,18 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
2005-2007 Brian Nelson <pyro at debian.org>
2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
+ 2013-2014 Dmitry Shachnev <mitya57 at debian.org>
License: LGPL-2.1
-Files: tools/pngdumper/* tests/system/auto/tst_imagecompare.cpp tests/system/auto/tst_imagecompare.h tests/system/auto/imagecompare.cpp tests/system/auto/imagecompare.h tests/system/auto/main.cpp tests/auto/tst_qtimageformats.cpp
+Files: tools/pngdumper/*
+ tests/system/auto/tst_imagecompare.cpp
+ tests/system/auto/tst_imagecompare.h
+ tests/system/auto/imagecompare.cpp
+ tests/system/auto/imagecompare.h
+ tests/system/auto/main.cpp
+ tests/auto/tst_qtimageformats.cpp
Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
Files: tools/pngdumper/*.qml
Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
@@ -58,21 +65,23 @@ Files: *.qdoc
Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
License: GFDL-NIV-1.3
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
- GNU Lesser General Public License version 2.1:
+License: LGPL-2.1-or-3 with Digia-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 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 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.
.
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 Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ 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:
As an additional permission to the GNU Lesser General Public License version
--
qtimageformats packaging
More information about the pkg-kde-commits
mailing list