[SCM] khtml packaging branch, kubuntu_vivid_backports, updated. ubuntu/5.14.0-0ubuntu1

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=e35ba69

The following commit has been merged in the kubuntu_vivid_backports branch:
commit e35ba6995b53aaeb3d430532722d64c95ece9d78
Merge: 55290aeadf2c6660a7b081ba2babca43b4cf2b52 eca36656b67a9a58feee78da28597f5ead59e035
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Aug 6 15:35:07 2015 +0200

    merge

 debian/.gitattributes       | 1 -
 debian/changelog            | 7 +++++++
 debian/libkf5khtml5.symbols | 8 +-------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --cc debian/libkf5khtml5.symbols
index 52589eb,2e01980..7952fb9
--- a/debian/libkf5khtml5.symbols
+++ b/debian/libkf5khtml5.symbols
@@@ -3298,9 -3275,8 +3292,9 @@@ libKF5KHtml.so.5 libkf5khtml5 #MINVER
   _ZTVN3DOM9DOMStringE at Base 4.96.0
   _ZTVN3DOM9DomSharedE at Base 4.96.0
   _ZTVN3DOM9TextEventE at Base 4.96.0
 + _ZTVN3KJS14JSGlobalObjectE at Base 5.12.0+git20150804.1621
   (arch=!armel !armhf)_ZTVN3KJS6JSCellE at Base 4.96.0
-  _ZTVN3KJS7JSValueE at Base 4.96.0
+  (arch=!armhf)_ZTVN3KJS7JSValueE at Base 4.96.0
   _ZTVN5khtml10ChildFrameE at Base 4.96.0
   _ZTVN5khtml10MouseEventE at Base 4.96.0
   _ZTVN5khtml14MouseMoveEventE at Base 4.96.0

-- 
khtml packaging