[SCM] frameworkintegration packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g5c43253

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/frameworkintegration.git;a=commitdiff;h=22d401e

The following commit has been merged in the kubuntu_wily_archive branch:
commit 22d401e2a71f63fd38d483d47ca4cb4877d5e48e
Merge: b5221ced329e2e95bfb14c9e7f9eaae766fc4b14 9b0e648eab97ddb29174bc42ad4d4ac441430aab
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 16 13:26:03 2015 +0200

    Merge commit '9b0e648eab97ddb29174bc42ad4d4ac441430aab'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index 3572a46,77497f1..43f5250
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,21 +1,45 @@@
 +frameworkintegration (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:14 +0200
 +
+ frameworkintegration (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:27:50 +0200
+ 
 +frameworkintegration (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:45 +0100
 +
+ frameworkintegration (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:37:40 +0100
+ 
+ frameworkintegration (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:00:45 +0100
+ 
 +frameworkintegration (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * 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>  Fri, 06 Feb 2015 16:15:33 +0100
 +
  frameworkintegration (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
frameworkintegration packaging