[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 200fc283c787697a4ab178cfae96f6f950cf1343
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Jun 10 16:47:11 2011 +0200

    Update FindTelepathyQt4.cmake and search for Tp-Qt4 >= 0.7.1
---
 CMakeLists.txt                       | 2 +-
 cmake/modules/FindTelepathyQt4.cmake | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d4a74b..7b78e36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set (CMAKE_MODULE_PATH
 
 set(KDE_MIN_VERSION "4.4.75")
 find_package (KDE4 4.4.75 REQUIRED)
-find_package (TelepathyQt4 REQUIRED)
+find_package (TelepathyQt4 0.7.1 REQUIRED)
 
 include (KDE4Defaults)
 include (MacroLibrary)
diff --git a/cmake/modules/FindTelepathyQt4.cmake b/cmake/modules/FindTelepathyQt4.cmake
index b4d4868..c7f8f91 100644
--- a/cmake/modules/FindTelepathyQt4.cmake
+++ b/cmake/modules/FindTelepathyQt4.cmake
@@ -17,7 +17,11 @@ endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.1.9)
+    if (TelepathyQt4_FIND_VERSION_EXACT)
+        pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4=${TelepathyQt4_FIND_VERSION})
+    else (TelepathyQt4_FIND_VERSION_EXACT)
+        pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=${TelepathyQt4_FIND_VERSION})
+    endif (TelepathyQt4_FIND_VERSION_EXACT)
 endif(PKG_CONFIG_FOUND)
 
 find_path(TELEPATHY_QT4_INCLUDE_DIR

-- 
ktp-contact-list packaging