[SCM] khtml packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g41bb7c3

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 41bb7c3473b0d4cb995115232c04391c6e3e88ea
Merge: c47c9f730bedcde353bc2c2508bef2022ce71a8c aa19ac49a559c57a4a2c8f37e4ac9924cd2a3fd4
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:02:19 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog            | 11 +++++++++
 debian/control              | 56 ++++++++++++++++++++++-----------------------
 debian/libkf5khtml5.symbols | 31 ++++++++++++-------------
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --cc debian/changelog
index cfe5f89,3d4f795..b9a86b1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,14 +1,24 @@@
+ khtml (5.11.0-1) unstable; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+   [ Felix Geyer ]
+   * Update the symbols file.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 14:55:30 +0200
+ 
 +khtml (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:09:14 +0200
 +
  khtml (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
khtml packaging