[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=e52481d

The following commit has been merged in the master branch:
commit e52481d0f1d8eb3607120d8ec31b672f9e9dd2d6
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Tue Oct 4 23:17:56 2011 +0200

    Forgot to find_package QtGlib in FindTelepathyLoggerQt4
---
 cmake/modules/FindTelepathyLoggerQt4.cmake | 7 ++++---
 lib/CMakeLists.txt                         | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/FindTelepathyLoggerQt4.cmake b/cmake/modules/FindTelepathyLoggerQt4.cmake
index 19cae90..0e9bc8b 100644
--- a/cmake/modules/FindTelepathyLoggerQt4.cmake
+++ b/cmake/modules/FindTelepathyLoggerQt4.cmake
@@ -20,6 +20,7 @@ find_package(TelepathyGlib)
 find_package(GObject)
 find_package(GIO)
 find_package(GLIB2)
+find_package(QtGLib)
 
 list(APPEND TELEPATHY_LOGGER_QT4_LIBRARIES
     ${TELEPATHY_LOGGER_LIBRARIES}
@@ -38,7 +39,7 @@ list(APPEND TELEPATHY_LOGGER_QT4_INCLUDE_DIRS
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
 # if all listed variables are TRUE
-find_package_handle_standard_args(TelepathyLoggerQt4  DEFAULT_MSG
-                                  TELEPATHY_LOGGER_QT4_LIBRARY TELEPATHY_LOGGER_QT4_INCLUDE_DIR)
+find_package_handle_standard_args(TELEPATHY_LOGGER_QT4  DEFAULT_MSG
+                                  TELEPATHY_LOGGER_QT4_LIBRARY TELEPATHY_LOGGER_QT4_INCLUDE_DIRS)
 
-mark_as_advanced(TELEPATHY_LOGGER_QT4_INCLUDE_DIR TELEPATHY_LOGGER_QT4_LIBRARY )
+mark_as_advanced(TELEPATHY_LOGGER_QT4_INCLUDE_DIRS TELEPATHY_LOGGER_QT4_LIBRARY )
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 4bae13d..1db1cc6 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -43,7 +43,8 @@ set(telepathy_chat_handler_lib_PRETTY_HDRS
 )
 
 set(telepathy_chat_handler_lib_UI
-    chat-widget.ui)
+    chat-widget.ui
+)
 
 kde4_add_ui_files(telepathy_chat_handler_lib_SRCS ${telepathy_chat_handler_lib_UI})
 
@@ -55,7 +56,6 @@ include_directories(
     ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
 )
 
-
 target_link_libraries(ktelepathy_chat_lib
     ${TELEPATHY_LOGGER_QT4_LIBRARIES}
 

-- 
ktp-text-ui packaging