[SCM] kitemviews packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-4-g8d30eda

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8d30eda6a7a74735a9d2bd76979b89a7b9fba2f3
Merge: 841a3c9f209d247c89112f1ce217fdd8751e2d75 c22f0d6a4ac24a9a6f0c80b2671e46a4e915f233
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:58:31 2015 +0200

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

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

diff --cc debian/changelog
index 770aa1c,dd2bc38..55e01ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kitemviews (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>  Fri, 26 Jun 2015 15:32:09 +0200
+ 
 +kitemviews (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:33:08 +0200
 +
  kitemviews (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).

-- 
kitemviews packaging