[SCM] khtml packaging branch, master, updated. 085bd01b39575e3121446506dd4afe5d1962ae4a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1efb455a417d7a446c1d1574787f0dae096b0f15
Merge: 8e58ce6eea8b3d6a77bf96f45c7128cb5317169c f86537b8e875b455d1c7d51f11e2362cf7a3bf4b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:21:18 2015 +0200

    Merge commit 'f86537b8e875b455d1c7d51f11e2362cf7a3bf4b'
    
    Conflicts:
    	debian/control
    	debian/libkf5khtml5.symbols
    	debian/rules
    	debian/tests/control
    	debian/tests/testsuite.xsession

 debian/changelog            | 36 ++++++++++++++++++++++++++++++++++++
 debian/libkf5khtml5.symbols |  7 +++----
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index ef9a17b,d338b2b..ecd6c43
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,39 +1,66 @@@
 +khtml (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:25:18 +0200
 +
+ khtml (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:21:22 +0200
+ 
 +khtml (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * New upstream release (5.8.0).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Mar 2015 17:45:44 +0100
 +
+ khtml (5.8.0-0ubuntu2) vivid; urgency=medium
+ 
+   * Update symbols
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Mar 2015 14:22:57 +0100
+ 
+ khtml (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:47:38 +0100
+ 
+ khtml (5.7.0-0ubuntu3) vivid; urgency=medium
+ 
+   * Further symbols files updates for arch specific symbols fun
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Feb 2015 19:13:20 +0100
+ 
+ khtml (5.7.0-0ubuntu2) vivid; urgency=medium
+ 
+   * Update .symbols for ppc64el
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Feb 2015 16:28:50 +0100
+ 
+ khtml (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:04:41 +0100
+ 
 +khtml (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Update install files.
 +  * Add acc autopkgtests.
 +  * Update watch file.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Feb 2015 16:57:08 +0100
 +
  khtml (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
khtml packaging