[SCM] qttools packaging branch, master, updated. debian/5.3.2-3-2-ga46d234

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit a46d23437ff66ef8bab73d21800c486fc995764e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 8 22:00:11 2014 +0400

    Use correct exception syntax in debian/copyright.
---
 debian/changelog | 2 ++
 debian/copyright | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af1496d..6508580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qttools-opensource-src (5.3.2-4) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Use correct exception syntax in debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Oct 2014 21:59:06 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 71bab31..87d3a65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: http://releases.qt-project.org/qt5/5.0.1/submodules_tar/
 
 Files: *
 Copyright: 2012-2014 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 with Digia-1.1 exception or GPL-3
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -19,7 +19,7 @@ License: LGPL-2.1
 
 Files: tests/auto/cmake/test_translation_macros/myi18nobject.cpp tests/auto/cmake/test_translation_macros/some_dir/some_include.h
 Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.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/linguist/Qt5LinguistToolsMacros.cmake
 Copyright: 2005-2011 Kitware, Inc.
@@ -72,7 +72,7 @@ Copyright: 2003-2006 Ben van Klinken and the CLucene Team
            2012 Digia Plc and/or its subsidiary(-ies)
 License: LGPL-2.1
 
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1 with Digia-1.1 exception
  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
@@ -196,7 +196,7 @@ License: Apache-2.0
 
 Files: examples/designer/arthurplugin/plugin.cpp
 Copyright: 2012 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 with Digia-1.1 exception or GPL-3
 
 Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).

-- 
qttools packaging