[SCM] qtdoc packaging branch, master, updated. debian/5.3.2-1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit fd9bec682f85e31e4a832362f011eab1fafd6cac
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Sep 19 15:50:33 2014 +0400

    Update debian/copyright for new release.
---
 debian/changelog |  1 +
 debian/copyright | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b45a711..840bea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtdoc-opensource-src (5.3.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Add myself to Uploaders.
   * Update Vcs-Browser field to point to cgit interface.
+  * Update debian/copyright for new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Sep 2014 15:42:19 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 054bc58..a66f321 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: qtdoc-opensource-src
 Source: http://releases.qt-project.org/qt5/*/submodules/
 
 Files: *
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2013-2014 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
 
 Files: debian/*
@@ -17,17 +17,25 @@ License: LGPL-2.1
 
 Files: tools/pngdumper/* tests/system/auto/tst_imagecompare.cpp tests/system/auto/tst_imagecompare.h tests/system/auto/imagecompare.cpp tests/system/auto/imagecompare.h tests/system/auto/main.cpp tests/auto/tst_qtdoc.cpp
 Copyright: 2013 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: tools/pngdumper/*.qml
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
 
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-NIV-1.3
+
+Files: doc/src/platforms/*blackberry.qdoc
+Copyright: 2014 BlackBerry Limited.
+License: GFDL-NIV-1.3
+
+Files: doc/src/development/cmake-manual.qdoc
+Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
 License: GFDL-NIV-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

-- 
qtdoc packaging