[SCM] kwidgetsaddons packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-7-ga31cb40

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a31cb40022025dafc35423323bd7565aada99321
Merge: 82dfa0ec82cc1e57fce48f0f29cfbe0d53eeb544 268b18d4504688e59ed0d0a664097bf3e62c351c
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Jun 29 15:04:55 2015 +0200

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

 debian/changelog | 9 +++++++--
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 8031ffe,4a7833e..3fc4a9d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,18 @@@
- kwidgetsaddons (5.10.0-0ubuntu1) wily; urgency=medium
+ kwidgetsaddons (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
    * Update symbols files from buildds logs (5.9.0-1).
+   * New upstream release (5.11.0).
+ 
 - -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 15:32:52 +0200
++-- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 15:32:52 +0200
++
++kwidgetsaddons (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:01:55 +0200
  
  kwidgetsaddons (5.9.0-1) experimental; urgency=medium
  
@@@ -111,7 -108,7 +116,7 @@@ kwidgetsaddons (5.1.0-0ubuntu1) utopic
  
    [ Scarlett Clark ]
    * New upstream release
--  * Patched symbols with batchpatch. 
++  * Patched symbols with batchpatch.
  
   -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:12:03 +0200
  

-- 
kwidgetsaddons packaging