[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=81037d4

The following commit has been merged in the master branch:
commit 81037d4dcd1c19a00f46d543c5dc9fdd9a42439a
Author: Anant Kamath <kamathanant at gmail.com>
Date:   Mon Sep 2 05:53:25 2013 +0530

    Removed CMake check for ModemManager
---
 plugins/pintxo/CMakeLists.txt         |  5 +----
 plugins/pintxo/FindModemManager.cmake | 42 -----------------------------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/plugins/pintxo/CMakeLists.txt b/plugins/pintxo/CMakeLists.txt
index 753c504..dc19015 100644
--- a/plugins/pintxo/CMakeLists.txt
+++ b/plugins/pintxo/CMakeLists.txt
@@ -1,15 +1,12 @@
 project (ktpaccountskcm-plugin-pintxo)
 
-#find_package(ModemManager REQUIRED)
+INCLUDE(FindPkgConfig)
 
 pkg_check_modules(LIBMODEMMANAGERQT REQUIRED ModemManagerQt)
     if (NOT LIBMODEMMANAGERQT_FOUND)
     message(FATAL_ERROR "ERROR: libModemManagerQt not found")
 endif (NOT LIBMODEMMANAGERQT_FOUND)
 
-
-INCLUDE(FindPkgConfig)
-
 include_directories (${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}
                      ${QT_INCLUDES}
diff --git a/plugins/pintxo/FindModemManager.cmake b/plugins/pintxo/FindModemManager.cmake
deleted file mode 100644
index 7f13087..0000000
--- a/plugins/pintxo/FindModemManager.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# - Try to find ModemManager
-# Once done this will define
-#
-#  MODEMMANAGER_FOUND - system has ModemManager
-#  MODEMMANAGER_INCLUDE_DIRS - the ModemManager include directories
-#  MODEMMANAGER_LIBRARIES - the libraries needed to use ModemManager
-#  MODEMMANAGER_CFLAGS - Compiler switches required for using ModemManager
-#  MODEMMANAGER_VERSION - version number of ModemManager
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
-# Copyright (c) 2007, Will Stephenson, <wstephenson at kde.org>
-# Copyright (c) 2013, Lukas Tinkl, <ltinkl at redhat.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (MODEMMANAGER_INCLUDE_DIRS)
-   # in cache already
-   SET(NetworkManager_FIND_QUIETLY TRUE)
-ENDIF (MODEMMANAGER_INCLUDE_DIRS)
-
-IF (NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   find_package(PkgConfig)
-   PKG_SEARCH_MODULE( MODEMMANAGER ModemManager )
-ENDIF (NOT WIN32)
-
-IF (MODEMMANAGER_FOUND)
-   IF (ModemManager_FIND_VERSION AND ("${MODEMMANAGER_VERSION}" VERSION_LESS "${ModemManager_FIND_VERSION}"))
-      MESSAGE(FATAL_ERROR "ModemManager ${MODEMMANAGER_VERSION} is too old, need at least ${ModemManager_FIND_VERSION}")
-   ELSEIF (NOT ModemManager_FIND_QUIETLY)
-      MESSAGE(STATUS "Found ModemManager ${MODEMMANAGER_VERSION}: ${MODEMMANAGER_INCLUDE_DIRS}")
-   ENDIF()
-ELSE (MODEMMANAGER_FOUND)
-   IF (ModemManager_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could NOT find ModemManager, check FindPkgConfig output above!")
-   ENDIF (ModemManager_FIND_REQUIRED)
-ENDIF (MODEMMANAGER_FOUND)
-
-MARK_AS_ADVANCED(MODEMMANAGER_INCLUDE_DIRS)

-- 
ktp-accounts-kcm packaging