[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=83e68fc

The following commit has been merged in the master branch:
commit 83e68fcc98d056e3895e72f11bca18cd623c9d33
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Jan 8 01:20:36 2013 +0100

    Add presence applet to CMakeLists
---
 CMakeLists.txt                              | 16 +++++++++++++-
 presence/CMakeLists.txt                     | 33 +++--------------------------
 presence/plasma-applet-ktp-presence.desktop |  2 +-
 presence/src/presence-applet.cpp            |  6 +++---
 4 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4836192..3e6d8df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(ktp_plasma)
+project(ktp-desktop-applets)
 
 set(CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
@@ -11,6 +11,20 @@ find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
 find_package(TelepathyQt4 0.8.90 REQUIRED)
 find_package(KTp REQUIRED)
 
+include(KDE4Defaults)
+
+add_definitions(${QT_DEFINITIONS}
+                ${KDE4_DEFINITIONS}
+)
+
+include_directories(${CMAKE_SOURCE_DIR}
+		    ${CMAKE_BINARY_DIR}
+		    ${KDE4_INCLUDES}
+		    ${TELEPATHY_QT4_INCLUDE_DIR}
+		    ${KTP_INCLUDE_DIR}
+)
+
 add_subdirectory(chat)
 add_subdirectory(contact)
 add_subdirectory(contactlist)
+add_subdirectory(presence)
diff --git a/presence/CMakeLists.txt b/presence/CMakeLists.txt
index 7becc7e..fd12ffa 100644
--- a/presence/CMakeLists.txt
+++ b/presence/CMakeLists.txt
@@ -1,34 +1,7 @@
-project(ktp-presence-applet)
-
-set(CMAKE_MODULE_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    ${CMAKE_MODULE_PATH}
-)
-
-set(KDE_MIN_VERSION "4.6.0")
-
-set(IS_KTP_INTERNAL_MODULE TRUE)
-
-find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
-find_package(TelepathyQt4 0.8.90 REQUIRED)
-find_package(KTp REQUIRED)
-
-include(KDE4Defaults)
-
-add_definitions(${QT_DEFINITIONS}
-                ${KDE4_DEFINITIONS}
-)
-
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${CMAKE_BINARY_DIR}
-                    ${KDE4_INCLUDES}
-                    ${TELEPATHY_QT4_INCLUDE_DIR}
-                    ${KTP_INCLUDE_DIR}
-)
-
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(plasma_applet_ktp_presence_SRCS
-    src/presenceapplet.cpp
+    src/presence-applet.cpp
 )
 
 
@@ -43,4 +16,4 @@ target_link_libraries(plasma_applet_ktp_presence
                      )
 
 install(TARGETS plasma_applet_ktp_presence DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma_applet_ktp_presence.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES plasma-applet-ktp-presence.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/presence/plasma-applet-ktp-presence.desktop b/presence/plasma-applet-ktp-presence.desktop
index 5e179d3..ad88e4b 100644
--- a/presence/plasma-applet-ktp-presence.desktop
+++ b/presence/plasma-applet-ktp-presence.desktop
@@ -41,7 +41,7 @@ Icon=user-online
 X-Plasma-DefaultSize=128,128
 
 X-KDE-Library=plasma_applet_ktp_presence
-X-KDE-PluginInfo-Name=ktp_presence
+X-KDE-PluginInfo-Name=org.kde.ktp-presence
 X-KDE-PluginInfo-Category=Online Services
 X-KDE-PluginInfo-Author=Francesco Nwokeka
 X-KDE-PluginInfo-Email=francesco.nwokeka at gmail.com
diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 6cc7b05..aa44cb0 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "presenceapplet.h"
+#include "presence-applet.h"
 
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
@@ -341,7 +341,7 @@ void TelepathyPresenceApplet::toolTipHidden()
     Plasma::ToolTipManager::self()->clearContent(this);
 }
 
-#include "presenceapplet.moc"
+#include "presence-applet.moc"
 
 // This is the command that links your applet to the .desktop file
-K_EXPORT_PLASMA_APPLET(ktp_presence, TelepathyPresenceApplet)
+K_EXPORT_PLASMA_APPLET(org.kde.ktp-presence, TelepathyPresenceApplet)

-- 
ktp-contact-applet packaging