[SCM] qtquickcontrols packaging branch, kubuntu_unstable, updated. debian/5.5.0-1-2-g8bfa942

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8bfa942403db7938b9221994322b5ff21542f016
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Aug 30 20:17:19 2015 +0300

    Minor debian/copyright fixes.
---
 debian/changelog |  2 ++
 debian/copyright | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 148bab6..709a7f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtquickcontrols-opensource-src (5.5.0-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Minor debian/copyright fixes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Aug 2015 20:16:22 +0300
 
diff --git a/debian/copyright b/debian/copyright
index a003359..c407413 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -123,9 +123,8 @@ License: LGPL-3
 
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ it under the terms of the GNU General Public License, version 2
+ as published by the Free Software Foundation.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -147,9 +146,9 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) nor the
-     names of its contributors may be used to endorse or promote products
-     derived from this software without specific prior written permission.
+   * Neither the name of The Qt Company Ltd nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-- 
qtquickcontrols packaging