[SCM] extra-cmake-modules packaging branch, master, updated. debian/5.37.0-2-89-geea6c57

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 56176cde8b33be269616b5e8a800817d3bb21235
Merge: 6f4f3c28c2e8e297a8349a4f781f955edad9d5f7 72e7b2b8763c81778ba99cf850a56d582bd835e4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Sep 29 15:51:16 2015 -0700

    Fix merge.

 debian/changelog | 28 +++++++++++++++++++++++++---
 debian/rules     |  4 ++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index dcd679d,1fdd12d..abf34df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,23 +1,27 @@@
- extra-cmake-modules (5.14.0-0ubuntu1) UNRELEASED; urgency=medium
 -extra-cmake-modules (5.14.0-0ubuntu2) wily; urgency=medium
++extra-cmake-modules (5.14.0-0ubuntu2) UNRELEASED; urgency=medium
+ 
++  [ Jonathan Riddell ]
+   * cherry-pick debian/rules change from Debian to not run tests, unknown
+     failure in powerpc
+ 
 - -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Sep 2015 15:29:49 +0100
++  [ Scarlett Clark ]
++  * Vivid backport.
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 29 Sep 2015 15:40:36 -0700  
+ 
+ extra-cmake-modules (5.14.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Thu, 17 Sep 2015 13:08:43 +0100
+ 
+ extra-cmake-modules (5.13.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 12:46:25 +0200
+ 
+ extra-cmake-modules (5.12.0-0ubuntu1) wily; urgency=medium
  
    * New upstream release
    * Vivid backport. 

-- 
extra-cmake-modules packaging