[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=4a9ade5

The following commit has been merged in the master branch:
commit 4a9ade5988bd74b1218bfc020c22d542a929252b
Author: George Brooke <george+kde.bugs at george-brooke.co.uk>
Date:   Tue Dec 13 17:28:43 2011 +0100

    Port to tp-qt 0.9
    
    BUG: 288549
---
 CMakeLists.txt                       |  2 +-
 cmake/modules/FindTelepathyQt4.cmake | 43 ------------------------------------
 mainwindow.cpp                       |  6 ++---
 mainwindow.h                         |  2 +-
 4 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a09e7dc..63a319d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set (CMAKE_MODULE_PATH
 set(KDE_MIN_VERSION "4.7.0")
 set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
 find_package(KDE4 REQUIRED)
-find_package(TelepathyQt4 0.7.1 REQUIRED)
+find_package(TelepathyQt4 0.8.9 REQUIRED)
 find_package(KTelepathy REQUIRED)
 
 include(KDE4Defaults)
diff --git a/cmake/modules/FindTelepathyQt4.cmake b/cmake/modules/FindTelepathyQt4.cmake
deleted file mode 100644
index c7f8f91..0000000
--- a/cmake/modules/FindTelepathyQt4.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# Try to find the Qt4 binding of the Telepathy library
-# TELEPATHY_QT4_FOUND - system has TelepathyQt4
-# TELEPATHY_QT4_INCLUDE_DIR - the TelepathyQt4 include directory
-# TELEPATHY_QT4_LIBRARIES - Link these to use TelepathyQt4
-
-# Copyright (c) 2008, Allen Winter <winter at kde.org>
-# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko at gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-set(TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
-if(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
-  # Already in cache, be silent
-  set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
-endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-    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
-          NAMES TelepathyQt4/Types
-          HINTS
-          ${PC_TELEPATHY_QT4_INCLUDEDIR}
-          ${PC_TELEPATHY_QT4_INCLUDE_DIRS}
-)
-
-find_library(TELEPATHY_QT4_LIBRARIES
-             NAMES telepathy-qt4
-             HINTS
-             ${PC_TELEPATHY_QT4_LIBDIR}
-             ${PC_TELEPATHY_QT4_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(TELEPATHY_QT4 DEFAULT_MSG
-                                  TELEPATHY_QT4_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 16b6e0c..5c69b16 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -40,9 +40,9 @@
 #include <QDebug>
 #include <QAbstractButton>
 
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingChannelRequest>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingChannelRequest>
+#include <TelepathyQt/PendingReady>
 
 #include "flat-model-proxy.h"
 
diff --git a/mainwindow.h b/mainwindow.h
index 210ac02..3e7c70a 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -25,7 +25,7 @@
 
 #include <KUrl>
 
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
 
 class KPixmapSequenceOverlayPainter;
 namespace Ui {

-- 
ktp-send-file packaging