[SCM] qtwebsockets packaging branch, master, updated. debian/5.3.1-1-5-g3471d45

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 3ea0680436a76e6f1a40f1e7e05284cb6585636d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Sep 14 14:44:56 2014 +0400

    Use correct exception syntax in debian/copyright.
    
    According to the specification (and to Lintian), the syntax is:
    
        short-license-name with exception-name exception
    
    In our case it will be:
    
        LGPL-2.1 with Digia-1.1 exception
---
 debian/changelog | 3 +++
 debian/copyright | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69b8998..57b4d51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtwebsockets-opensource-src (5.3.1-2) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Fix spaces in debian/copyright. Thanks Scott Kitterman for the hint!
 
+  [ Dmitry Shachnev ]
+  * Use correct exception syntax in debian/copyright.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Sep 2014 14:18:42 -0300
 
 qtwebsockets-opensource-src (5.3.1-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 8452669..0b6ff04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ License: LGPL-2.1
 
 Files: *
 Copyright: 2014 Kurt Pattyn <pattyn.kurt at gmail.com>
-License: LGPL-2.1_with_Digia_ Qt_LGPL_Exception_1.1 or GPL-3
+License: LGPL-2.1 with Digia-1.1 exception or GPL-3
 
 Files: src/websockets/doc/src/*.qdoc
 Copyright: 2014 Kurt Pattyn <pattyn.kurt at gmail.com>
@@ -25,7 +25,7 @@ Files: examples/websockets/doc/*.qdoc
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
 License: GFDL-NIV-1.3
 
-License: LGPL-2.1_with_Digia_ Qt_LGPL_Exception_1.1 or GPL-3
+License: LGPL-2.1 with Digia-1.1 exception or GPL-3
  GNU Lesser General Public License version 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

-- 
qtwebsockets packaging