[SCM] extra-cmake-modules packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-17-g21a5462

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=ea152af

The following commit has been merged in the kubuntu_wily_archive branch:
commit ea152af14f7dc8a254086a291a3566ecf690b45c
Merge: eabe4aedc9778a373e229e3ae40863e54e8bcd5a 4242cf6c66021096e7f55d64ceaa8dc8353c3d13
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Jun 29 15:03:20 2015 +0200

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

 debian/changelog | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 52876fb,e693964..b636c4c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,17 @@@
- extra-cmake-modules (5.10.0-0ubuntu1) wily; urgency=medium
+ extra-cmake-modules (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
 - -- Maximiliano Curia <maxy at debian.org>  Wed, 24 Jun 2015 21:42:38 +0200
++-- Maximiliano Curia <maxy at debian.org>  Wed, 24 Jun 2015 21:42:38 +0200
++
++extra-cmake-modules (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:31:55 +0200
  
  extra-cmake-modules (5.9.0-1) experimental; urgency=medium
  

-- 
extra-cmake-modules packaging