[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-2-2-g4fc365d

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 4fc365d0a3a9859d78a011cfe1a3e4424fa20e5f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Dec 17 21:13:45 2014 +0300

    More debian/copyright updates.
---
 debian/changelog | 2 ++
 debian/copyright | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c0b46c..0df21f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtbase-opensource-src (5.4.0+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * More debian/copyright updates.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Dec 2014 21:05:31 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 8c8245a..18a92a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -490,8 +490,7 @@ License: Unicode
  use or other dealings in these Data Files or Software without prior
  written authorization of the copyright holder.
 
-Files: src/gui/text/qharfbuzz_copy_p.h
-       src/3rdparty/harfbuzz/*
+Files: src/3rdparty/harfbuzz/*
 Copyright: 1998-2005 David Turner
            1998-2004 Werner Lemberg
            2000-2007 Red Hat, Inc
@@ -517,6 +516,11 @@ License: Harfbuzz
  ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
  PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
+Files: src/gui/text/qharfbuzzng.cpp
+       src/gui/text/qharfbuzzng_p.h
+Copyright: 2013 Konstantin Ritt
+License: LGPL-2.1-or-3 with Digia-1.1 exception
+
 Files: src/testlib/3rdparty/cycle_p.h
 Copyright: 2003, 2006 Matteo Frigo
            2003, 2006 Massachusetts Institute of Technology

-- 
qtbase packaging