[SCM] kross packaging branch, master, updated. 09270ac83a1ff1503cc2ae5bfeaf67b4ac63946d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kross.git;a=commitdiff;h=4afccb8

The following commit has been merged in the master branch:
commit 4afccb8c173878e7cf67c63b4376e8c7e2f4e74d
Merge: ec2b8aebd8b105aa8c021e968f2367d00743fd9d dfea8253ef46da5162134140a9328d0ff5ccb24c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:23:40 2015 +0200

    Merge commit 'dfea8253ef46da5162134140a9328d0ff5ccb24c'
    
    Conflicts:
    	debian/control

 debian/changelog | 18 ++++++++++++++++++
 debian/control   |  1 +
 2 files changed, 19 insertions(+)

diff --cc debian/changelog
index 82de825,4712b91..320e960
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,21 +1,51 @@@
 +kross (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:20:05 +0200
 +
+ kross (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 23:22:08 +0200
+ 
 +kross (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * New upstream release (5.8.0).
 +  * Remove upstream applied patch:
 +    metafunction_header_char_to_qbytearraydata
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Mar 2015 18:13:19 +0100
 +
+ kross (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:48:25 +0100
+ 
+ kross (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:04:17 +0100
+ 
 +kross (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: metafunction_header_char_to_qbytearraydata
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 04 Feb 2015 11:12:59 +0100
 +
  kross (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kross packaging