[SCM] qtwebsockets packaging branch, kubuntu_unstable, updated. debian/5.4.0-2

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit e3f82775ac23f9df968c05fa56e2277f2da7a494
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 27 15:01:22 2014 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 37 +++++++++++++------------------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce95ca4..fd761c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebsockets-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Update build-dependencies for Qt 5.4.0.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2014 14:56:15 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 3607685..83247bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,31 +15,33 @@ License: LGPL-2.1
 
 Files: *
 Copyright: 2014 Kurt Pattyn <pattyn.kurt at gmail.com>
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/websockets/doc/src/*.qdoc
 Copyright: 2014 Kurt Pattyn <pattyn.kurt at gmail.com>
 License: GFDL-NIV-1.3
 
 Files: examples/websockets/doc/*.qdoc
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
 License: GFDL-NIV-1.3
 
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
- 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
@@ -63,19 +65,6 @@ License: LGPL-2.1 with Digia-1.1 exception or GPL-3
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-License: GPL-3
- GNU General Public License Usage
- .
- 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 license 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

-- 
qtwebsockets packaging