[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=bf6d2b0

The following commit has been merged in the master branch:
commit bf6d2b04594a7469adba08c17056d38ef933d501
Merge: 209bdd36f672646568bd5c9839f0145c6ab8f365 a15ae88b7b14168611d4e30d8d68507471a2c2b4
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Nov 13 13:48:01 2014 +0100

    Merge branch 'frameworks'

 CMakeLists.txt                      | 35 +++++++++++++++++-----------------
 cmake/modules/COPYING-CMAKE-SCRIPTS | 22 ---------------------
 cmake/modules/FindKTp.cmake         | 38 -------------------------------------
 src/contactrunner.cpp               |  7 +++++--
 src/contactrunner.h                 |  4 +---
 5 files changed, 24 insertions(+), 82 deletions(-)

diff --cc CMakeLists.txt
index 677b7c2,94115bd..430eb60
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,11 -1,12 +1,12 @@@
  project(KTPContactRunner)
  
 -set(KTP_CONTACT_RUNNER_VERSION "0.7.80")
 +set(KTP_CONTACT_RUNNER_VERSION "0.8.80")
  set(IS_KTP_INTERNAL_MODULE TRUE)
  
- set(CMAKE_MODULE_PATH
-     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
-     ${CMAKE_MODULE_PATH})
+ find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+ set (CMAKE_MODULE_PATH
+      ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}
+ )
  cmake_policy(SET CMP0002 OLD)
  
  # Find the required Libaries

-- 
ktp-contact-runner packaging