[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-14-5-g3ac88cc

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 3ac88cc61888dc624549ef7aaabd7bc5ddc0e01d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Feb 23 10:25:48 2016 +0300

    Correct license of japanese_230_50.qpf font in debian/copyright.
    
    Thanks to Arnout Vandecappelle for the patch.
    Closes: #815616.
---
 debian/changelog | 2 ++
 debian/copyright | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2dafb9f..8394e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtbase-opensource-src (5.5.1+dfsg-15) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Backport several upstream dbusmenu/dbustray related fixes from 5.6 branch.
+  * Correct license of japanese_230_50.qpf font in debian/copyright. Thanks to
+    Arnout Vandecappelle for the patch (closes: #815616).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Feb 2016 10:15:48 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 2785787..44f4871 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -415,7 +415,7 @@ Files: src/3rdparty/iaccessible2/idl/*
 Copyright: 2006 IBM Corporation
 License: BSD-3-clause
 
-Files: lib/fonts/helvetica*
+Files: lib/fonts/helvetica* lib/fonts/japanese_230_50.qpf
 Copyright: 1984-1989, 1994 Adobe Systems Incorporated.
            1988, 1994 Digital Equipment Corporation.
 License: Adobe
@@ -558,7 +558,7 @@ License: Courier
  ARE GIVEN, WHETHER EXPRESS OR IMPLIED INCLUDING, BUT LIMITED TO THE IMPLIED
  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-Files: lib/fonts/micro_40_50.qpf lib/fonts/japanese_230_50.qpf lib/fonts/fixed_120_50.qpf lib/fonts/fixed_70_50.qpf
+Files: lib/fonts/micro_40_50.qpf lib/fonts/fixed_120_50.qpf lib/fonts/fixed_70_50.qpf
 Copyright: -
 License: public-domain
  A public domain font. Share and enjoy. http://www.X.org

-- 
qtbase packaging