[SCM] kdewebkit packaging branch, master, updated. 2de1ea286d50fc954740e66471ad222719d7d0b5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 68d8b1d2c84b73c5a80b24ee2dc6f8aafdd92ec5
Merge: 2151edbd9bc5a860fe098bfc901f670b4851cbb4 425f735209f5fe14f0651391ac9199fa522c116f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:10:47 2015 +0200

    Merge commit '425f735209f5fe14f0651391ac9199fa522c116f'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index 5c792e5,4c02761..44fd4ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kdewebkit (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:24:31 +0200
 +
+ kdewebkit (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:24:10 +0200
+ 
 +kdewebkit (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:58 +0100
++
+ kdewebkit (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:31:24 +0100
  
 +kdewebkit (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:51 +0100
 +
  kdewebkit (5.7.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kdewebkit packaging