[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.2+dfsg-2-6-g90c21fe

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 90c21fee6f5426a095b38003c34d97bd152b432a
Merge: 6d350221dca60d361c11c39940cb4ee842ef50e1 853550f9186667d1252bc6723db8bc4ddbf71975
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Jun 19 04:31:30 2015 +0200

    Merge branch 'experimental' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog

 debian/changelog                             | 83 +++++++++++++++++++++----
 debian/control                               | 22 +++++--
 debian/copyright                             |  5 --
 debian/libqt5concurrent5.lintian-overrides   |  2 +-
 debian/libqt5concurrent5.symbols             |  2 +-
 debian/libqt5core5a.lintian-overrides        |  2 +-
 debian/libqt5core5a.symbols                  |  7 ++-
 debian/libqt5dbus5.lintian-overrides         |  2 +-
 debian/libqt5dbus5.symbols                   |  2 +-
 debian/libqt5gui5.install-common             |  1 -
 debian/libqt5gui5.lintian-overrides          |  2 +-
 debian/libqt5gui5.symbols                    | 12 ++--
 debian/libqt5libqgtk2.install                |  1 +
 debian/libqt5network5.lintian-overrides      |  2 +-
 debian/libqt5network5.symbols                |  2 +-
 debian/libqt5opengl5.lintian-overrides       |  2 +-
 debian/libqt5opengl5.symbols                 |  2 +-
 debian/libqt5printsupport5.lintian-overrides |  2 +-
 debian/libqt5printsupport5.symbols           |  2 +-
 debian/libqt5sql5.lintian-overrides          |  2 +-
 debian/libqt5sql5.symbols                    |  2 +-
 debian/libqt5test5.lintian-overrides         |  2 +-
 debian/libqt5test5.symbols                   |  2 +-
 debian/libqt5widgets5.lintian-overrides      |  2 +-
 debian/libqt5widgets5.symbols                | 14 ++---
 debian/libqt5xml5.lintian-overrides          |  2 +-
 debian/libqt5xml5.symbols                    |  2 +-
 debian/mark_private_symbols.sh               | 90 ----------------------------
 debian/patches/gnukfreebsd.diff              |  2 +-
 debian/patches/series                        |  1 +
 debian/qtbase5-doc-html.links                |  1 +
 debian/rules                                 |  4 +-
 32 files changed, 132 insertions(+), 149 deletions(-)

-- 
qtbase packaging