[SCM] qtscript packaging branch, kubuntu_unstable, updated. debian/5.4.2+dfsg-1-5-gb7f3ee4

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b7f3ee4fede24ff7372db06e2fd4aeb2b8c594a8
Merge: 2c02cf8019fa16971b419327bbcf8fb3dad46360 b2e16b745e79ce869a69ccb52a7949733c901565
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Jun 22 21:49:40 2015 +0200

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

 debian/changelog                 | 16 +++++++--
 debian/control                   |  8 ++---
 debian/copyright                 |  5 ---
 debian/libqt5script5.symbols     |  3 +-
 debian/mark_private_symbols.sh   | 78 ----------------------------------------
 debian/patches/s390x_jscore.diff |  4 +--
 debian/qtscript5-doc-html.links  |  1 +
 debian/rules                     |  2 +-
 8 files changed, 22 insertions(+), 95 deletions(-)

-- 
qtscript packaging