[SCM] qtserialport packaging branch, experimental, updated. debian/5.3.2-2-6-g24e9393
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Dec 27 09:27:34 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtserialport.git;a=commitdiff;h=e4ddda7
The following commit has been merged in the experimental branch:
commit e4ddda76ba9d7ea0e1e54f9caa5481fc089ac7bc
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Dec 27 12:25:03 2014 +0300
Update debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 36 ++++++++++++++----------------------
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a79d462..d412c71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtserialport-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Update build-dependencies for Qt 5.4.0.
* Build-depend on qtbase5-doc-html, for docs linking.
+ * Update debian/copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 27 Dec 2014 12:14:43 +0300
diff --git a/debian/copyright b/debian/copyright
index 684aa81..a1c861a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,12 @@ Upstream-Name: qtserialport-opensource-src
Source: https://qt.gitorious.org/qt/qtserialport
Files: *
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2014 Digia Plc and/or its subsidiary(-ies).
2011-2014 Denis Shienkov <denis.shienkov at gmail.com>
2011 Sergey Belyashov <Sergey.Belyashov at gmail.com>
2012-2013 Laszlo Papp <lpapp at kde.org>
2012 Andre Hartmann <aha_1980 at gmx.de>
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
Files: *.qdoc
Copyright: 2011-2012 Denis Shienkov <denis.shienkov at gmail.com>
@@ -25,23 +25,26 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2012 Felix Geyer <fgeyer at debian.org>
2013 Timo Jyrinki <timo.jyrinki at canonical.com>
2013 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+ 2014 Dmitry Shachnev <mitya57 at debian.org>
License: LGPL-2.1
-License: LGPL-2.1 with Digia-1.1 exception
- 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
@@ -65,17 +68,6 @@ License: LGPL-2.1 with Digia-1.1 exception
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.
-License: GPL-3
- Alternatively, this file may be used under the terms of the GNU General
- Public License version 3.0 as published by the Free Software Foundation
- and appearing in the file LICENSE.GPL included in the packaging of this
- file. Please review the following information to ensure the GNU General
- Public License version 3.0 requirements will be met:
- http://www.gnu.org/copyleft/gpl.html.
- .
- On Debian systems, the complete text of the GNU Public Licenses can be found
- in `/usr/share/common-licenses/GPL-3`.
-
License: LGPL-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
--
qtserialport packaging
More information about the pkg-kde-commits
mailing list