[SCM] frameworkintegration packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-4-gb0bb101

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b0bb10150ad2217b4dc08c1a7df193459eea744f
Merge: 54214f3180ef1c41b06ca2288d80af917b320283 41525669bb9d543681b67d8b1ea059edf2196003
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 08:10:00 2015 +0200

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

 debian/changelog |  7 +++++++
 debian/control   | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 5d48471,9fa79b6..7dbf14b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ frameworkintegration (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 17:27:10 +0200
+ 
 +frameworkintegration (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:49:09 +0200
 +
  frameworkintegration (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
frameworkintegration packaging