[SCM] qbs packaging branch, master, updated. debian/1.2.2+dfsg-1-9-g192ab87

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit d1fbba5a345a0c228044204e4a287ff81298fe89
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Sep 30 14:30:19 2014 +0400

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

diff --git a/debian/changelog b/debian/changelog
index 6c10cae..1fa6d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qbs (1.2.2+dfsg-2) UNRELEASED; urgency=medium
   * Update my e-mail address.
   * debian/watch: Use new repacksuffix option.
   * Update Vcs-Browser field to point to cgit interface.
+  * debian/copyright: Use correct exception syntax.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 27 Jul 2014 18:14:27 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 69d3b35..1fc72ac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,22 +5,22 @@ Files-Excluded: doc/templates/scripts/jquery.js
 
 Files: *
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1 with Digia-1.1 exception
 
 Files: src/lib/corelib/jsextensions/domxml.*
 Copyright: 2014, BogDan Vatra <bogdan at kde.org>
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1 with Digia-1.1 exception
 
 Files: src/plugins/scanner/cpp/*
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
            2008, Roberto Raggi <roberto.raggi at gmail.com>
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 and Expat
+License: LGPL-2.1 with Digia-1.1 exception and Expat
 
 Files: doc/reference/*
        examples/cocoa-touch-application/*
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
            2014, Petroules Corporation
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1 with Digia-1.1 exception
 
 Files: examples/helloworld-*/*
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
@@ -30,7 +30,7 @@ Files: debian/*
 Copyright: 2014, Dmitry Shachnev <mitya57 at debian.org>
 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

-- 
qbs packaging