[SCM] kjs packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-5-ga5c9fdf

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 05142f7a9044bd826f75225973b76fa244600302
Merge: 4948f40769828ab4f5320cd77a931264d995fda9 d4fa3bdaecec4b621ccb4ec96113e6079ded06cc
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:56:53 2015 +0200

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

 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 0901d7f,75400bd..71ce58e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,22 @@@
+ kjs (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * Update symbols files from buildds logs (5.9.0-1).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 27 Jun 2015 14:01:07 +0200
+ 
 +kjs (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +  * Update symbols files from buildds logs (5.9.0-1).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:12:25 +0200
 +
  kjs (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kjs packaging