[SCM] qtsensors packaging branch, master, updated. debian/5.3.0+dfsg-3-12-g199348c

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit e8dc6c697e3fff3ea2b376b0d4daa55d06310c01
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Sep 18 11:17:22 2014 +0400

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

diff --git a/debian/changelog b/debian/changelog
index 6641870..1126a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtsensors-opensource-src (5.3.2+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update my e-mail address.
   * Update Vcs-Browser field to point to cgit interface.
+  * Use correct exception syntax in debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Sep 2014 15:03:46 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 8decd21..6706dd7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Files: *
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
            2013 BogDan Vatra <bogdan at kde.org>
            2012 Lorn Potter
-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>
@@ -20,7 +20,7 @@ License: LGPL-2.1
 
 Files: tests/auto/cmake/test_modules/main.cpp
 Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-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: config.tests/bbsensor_compass/main.cpp
        config.tests/bbsensor_header/main.cpp
@@ -40,7 +40,7 @@ Files: config.tests/bbsensor_compass/main.cpp
        src/sensors/qambienttemperaturesensor.h
        src/sensors/qholstersensor.cpp
 Copyright: 2012 Research In Motion
-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: examples/*
        src/sensors/doc/snippets/*
@@ -55,7 +55,7 @@ Files: examples/sensors/sensor_explorer/import/propertyinfo.h
        examples/sensors/sensor_explorer/import/explorer.h
        examples/sensors/sensor_explorer/import/sensoritem.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: doc/config/scripts/superfish.js
 Copyright: 2008 Joel Birch
@@ -79,7 +79,7 @@ License: GFDL-NIV-1.3
  On Debian systems, the complete text of the GFDL-1.3 license can be found in
  `/usr/share/common-licenses/GFDL-1.3`,
 
-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

-- 
qtsensors packaging