[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=e55b061

The following commit has been merged in the master branch:
commit e55b061624d4094f6793d6a771766aa2b64438b5
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Jan 22 22:18:31 2012 +0200

    Rename to plasma_applet_ktp_presence, to follow the plasma applet naming policy and to fix translation catalog loading.
    
    CCMAIL: kde-i18n-doc at kde.org
---
 presence/CMakeLists.txt                     | 12 ++++++------
 presence/plasma-applet-ktp-presence.desktop |  4 ++--
 presence/src/presence-applet.cpp            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/presence/CMakeLists.txt b/presence/CMakeLists.txt
index 29b48c8..8e2c1de 100644
--- a/presence/CMakeLists.txt
+++ b/presence/CMakeLists.txt
@@ -29,22 +29,22 @@ include_directories(${CMAKE_SOURCE_DIR}
 )
 
 
-set(ktp-presence-applet_SRCS
+set(plasma_applet_ktp_presence_SRCS
     src/generalsettings.cpp
     src/presenceapplet.cpp
 )
 
-kde4_add_ui_files(ktp-presence-applet_SRCS
+kde4_add_ui_files(plasma_applet_ktp_presence_SRCS
                     src/generalsettings.ui
 )
 
-kde4_add_plugin(ktp-presence-applet ${ktp-presence-applet_SRCS})
-target_link_libraries(ktp-presence-applet
+kde4_add_plugin(plasma_applet_ktp_presence ${plasma_applet_ktp_presence_SRCS})
+target_link_libraries(plasma_applet_ktp_presence
                         ${KDE4_PLASMA_LIBS}
                         ${KDE4_KDEUI_LIBS}
                         ${TELEPATHY_QT4_LIBRARIES}
                         ${KTP_LIBRARIES}
                      )
 
-install(TARGETS ktp-presence-applet DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES ktp-presence-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS plasma_applet_ktp_presence DESTINATION ${PLUGIN_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 b1dad96..addd187 100644
--- a/presence/plasma-applet-ktp-presence.desktop
+++ b/presence/plasma-applet-ktp-presence.desktop
@@ -21,8 +21,8 @@ Icon=user-online
 
 X-Plasma-DefaultSize=128,128
 
-X-KDE-Library=ktp-presence-applet
-X-KDE-PluginInfo-Name=ktp-presence-applet
+X-KDE-Library=plasma_applet_ktp_presence
+X-KDE-PluginInfo-Name=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 476076a..fa21baf 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -259,4 +259,4 @@ void TelepathyPresenceApplet::updateClickAction(TelepathyPresenceApplet::OnClick
 #include "presenceapplet.moc"
 
 // This is the command that links your applet to the .desktop file
-K_EXPORT_PLASMA_APPLET(ktp-presence-applet, TelepathyPresenceApplet)
+K_EXPORT_PLASMA_APPLET(ktp_presence, TelepathyPresenceApplet)

-- 
ktp-contact-applet packaging