[SCM] kjs packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-gc32723e

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 0f692c7891cfea7cbee721e483fb8d680df0e6c3
Merge: 49dd61f0f311d099cfac532f622cc8207a17fc47 cb654b7947c28bf2b2f6a368403eff661e735c75
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:42:43 2015 +0200

    Merge commit 'cb654b7947c28bf2b2f6a368403eff661e735c75'
    
    Conflicts:
    	debian/control
    	debian/not-installed

 debian/changelog              | 18 ++++++++++++++++++
 debian/libkf5kjs-dev.manpages |  1 +
 debian/not-installed          |  1 +
 3 files changed, 20 insertions(+)

diff --cc debian/changelog
index 9923859,e88c132..d3065db
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,21 +1,50 @@@
 +kjs (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:21:39 +0200
 +
+ kjs (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:22:24 +0200
+ 
 +kjs (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * New upstream release (5.8.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Mar 2015 17:45:47 +0100
 +
+ kjs (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:48:41 +0100
+ 
+ kjs (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:04:02 +0100
+ 
 +kjs (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.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +  * New patch: install_missing_headers.
 +  * New patch: add_missing_ifndef.
 +  * Add missing dependency in -dev package.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Feb 2015 16:06:46 +0100
 +
  kjs (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kjs packaging