[SCM] qtenginio packaging branch, experimental, updated. debian/5.3.2-2-4-g718189c

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Dec 26 08:49:49 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtenginio.git;a=commitdiff;h=452382c

The following commit has been merged in the experimental branch:
commit 452382c84b3dbc5ffb2fdc42d9818906af852337
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Dec 26 11:48:14 2014 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 060fd8a..67d4fdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtenginio-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 26 Dec 2014 11:41:32 +0300
 
diff --git a/debian/copyright b/debian/copyright
index e9cb792..d172fb0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtenginio-opensource-src
 Source: http://download.qt-project.org/official_releases/qt/5.3/*/submodules/
 
 Files: *
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
 Files: examples/enginio/*
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
@@ -29,14 +29,19 @@ License: LGPL-2.1
  On Debian systems, the complete text of the GNU Lesser General Public
  License 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
 
-License: LGPL-2.1 with Digia-1.1 exception
+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.
+ 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.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License 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`.
  .
  In addition, as a special exception, Digia gives you certain additional
  rights.

-- 
qtenginio packaging



More information about the pkg-kde-commits mailing list