[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=eca3665

The following commit has been merged in the kubuntu_vivid_backports branch:
commit eca36656b67a9a58feee78da28597f5ead59e035
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Aug 6 15:33:36 2015 +0200

    Adjust .symbols for slightly changed symbol leaks from g++ 5, and drop JSValue from armhf like in khs.
---
 debian/.gitattributes       | 1 -
 debian/changelog            | 7 +++++++
 debian/libkf5khtml5.symbols | 6 +-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index b2ebd10..f779615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+khtml (5.12.0-0ubuntu2) wily; urgency=medium
+
+  * Adjust .symbols for slightly changed symbol leaks from g++ 5, and drop
+    JSValue from armhf like in khs.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 06 Aug 2015 11:34:32 +0200
+
 khtml (5.12.0-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
diff --git a/debian/libkf5khtml5.symbols b/debian/libkf5khtml5.symbols
index 8c95c6e..2e01980 100644
--- a/debian/libkf5khtml5.symbols
+++ b/debian/libkf5khtml5.symbols
@@ -65,10 +65,6 @@ libKF5KHtml.so.5 libkf5khtml5 #MINVER#
  _ZN17KHTMLImageFactoryD0Ev at Base 4.96.0
  _ZN17KHTMLImageFactoryD1Ev at Base 4.96.0
  _ZN17KHTMLImageFactoryD2Ev at Base 4.96.0
- (arch=!amd64 !armhf !i386 !mipsel)_ZN18QStyleOptionButtonD1Ev at Base 5.0.0
- (arch=!amd64 !armhf !i386 !mipsel)_ZN18QStyleOptionButtonD2Ev at Base 5.0.0
- (arch=!amd64 !armhf !i386 !mipsel)_ZN20QStyleOptionComboBoxD1Ev at Base 5.0.0
- (arch=!amd64 !armhf !i386 !mipsel)_ZN20QStyleOptionComboBoxD2Ev at Base 5.0.0
  _ZN3DOM10MouseEvent14initMouseEventERKNS_9DOMStringEbbRKNS_12AbstractViewElllllbbbbtRKNS_4NodeE at Base 4.96.0
  _ZN3DOM10MouseEventC1EPNS_14MouseEventImplE at Base 4.96.0
  _ZN3DOM10MouseEventC1ERKNS_5EventE at Base 4.96.0
@@ -3280,7 +3276,7 @@ libKF5KHtml.so.5 libkf5khtml5 #MINVER#
  _ZTVN3DOM9DomSharedE at Base 4.96.0
  _ZTVN3DOM9TextEventE at Base 4.96.0
  (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