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

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:18:23 UTC 2016 

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

The following commit has been merged in the master branch:
commit 1219b32be6688c4b955ed39951d6164bf9761560
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Mar 6 18:47:22 2013 +0100

    Move plasmoids versions to CMakeLists.txt, bump version to 0.5.80 (0.6-beta1)
    
    REVIEW: 109316
---
 CMakeLists.txt                                                 |  1 +
 chat/CMakeLists.txt                                            | 10 ++++++++--
 .../{metadata.desktop => metadata.desktop.cmake}               |  2 +-
 contact/CMakeLists.txt                                         |  5 ++++-
 ...contact.desktop => plasma-applet-ktp-contact.desktop.cmake} |  2 +-
 contactlist/CMakeLists.txt                                     |  9 +++++++--
 .../{metadata.desktop => metadata.desktop.cmake}               |  2 +-
 presence/CMakeLists.txt                                        |  5 ++++-
 ...esence.desktop => plasma-applet-ktp-presence.desktop.cmake} |  2 +-
 9 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc7abeb..6f48d69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ set(CMAKE_MODULE_PATH
 )
 set(IS_KTP_INTERNAL_MODULE TRUE)
 set(KDE_MIN_VERSION "4.7.0")
+set(KTP_DESKTOP_APPLETS_VERSION "0.5.80")
 
 find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
 find_package(TelepathyQt4 0.8.90 REQUIRED)
diff --git a/chat/CMakeLists.txt b/chat/CMakeLists.txt
index 7218fa4..5abc7d3 100644
--- a/chat/CMakeLists.txt
+++ b/chat/CMakeLists.txt
@@ -1,3 +1,9 @@
-install(DIRECTORY org.kde.ktp-chat DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/)
-install(FILES org.kde.ktp-chat/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-ktp-chat.desktop)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.kde.ktp-chat/metada.desktop.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metada.desktop
+               @ONLY)
+
+install(DIRECTORY org.kde.ktp-chat DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/ PATTERN metadata.desktop.cmake EXCLUDE)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.ktp-chat/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-ktp-chat.desktop)
 
diff --git a/chat/org.kde.ktp-chat/metadata.desktop b/chat/org.kde.ktp-chat/metadata.desktop.cmake
similarity index 98%
rename from chat/org.kde.ktp-chat/metadata.desktop
rename to chat/org.kde.ktp-chat/metadata.desktop.cmake
index c2f8964..985fce0 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -64,7 +64,7 @@ X-KDE-PluginInfo-Email=kde at lasath.org
 # X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Online Services
 X-KDE-PluginInfo-Name=org.kde.ktp-chat
-X-KDE-PluginInfo-Version=0.5.2
+X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
 
 # X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
diff --git a/contact/CMakeLists.txt b/contact/CMakeLists.txt
index b253031..a94a864 100644
--- a/contact/CMakeLists.txt
+++ b/contact/CMakeLists.txt
@@ -5,6 +5,9 @@ include_directories(
         ${TELEPATHY_QT4_INCLUDE_DIR}
 )
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plasma-applet-ktp-contact.desktop.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/plasma-applet-ktp-contact.desktop
+               @ONLY)
 
 set(plasma_applet_ktp_contact_SRCS
     src/abstract-contact-delegate.cpp
@@ -29,4 +32,4 @@ target_link_libraries(plasma_applet_ktp_contact
 
 install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.ktp-contact)
 install(TARGETS plasma_applet_ktp_contact DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-applet-ktp-contact.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-applet-ktp-contact.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/contact/plasma-applet-ktp-contact.desktop b/contact/plasma-applet-ktp-contact.desktop.cmake
similarity index 99%
rename from contact/plasma-applet-ktp-contact.desktop
rename to contact/plasma-applet-ktp-contact.desktop.cmake
index 4e002c4..0493e89 100644
--- a/contact/plasma-applet-ktp-contact.desktop
+++ b/contact/plasma-applet-ktp-contact.desktop.cmake
@@ -90,7 +90,7 @@ X-KDE-PluginInfo-Name=org.kde.ktp-contact
 X-KDE-PluginInfo-Category=Online Services
 X-KDE-PluginInfo-Author=Francesco Nwokeka
 X-KDE-PluginInfo-Email=francesco.nwokeka at gmail.com
-X-KDE-PluginInfo-Version=0.5
+X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
 X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/contactlist/CMakeLists.txt b/contactlist/CMakeLists.txt
index 025f749..3afcf1e 100644
--- a/contactlist/CMakeLists.txt
+++ b/contactlist/CMakeLists.txt
@@ -1,2 +1,7 @@
-install(DIRECTORY org.kde.ktp-contactlist DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/)
-install(FILES org.kde.ktp-contactlist/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-ktp-contactlist.desktop)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.kde.ktp-contactlist/metadata.desktop.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-contactlist/metadata.desktop
+               @ONLY)
+
+install(DIRECTORY org.kde.ktp-contactlist DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/ PATTERN metadata.desktop.cmake EXCLUDE)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-contactlist/metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.ktp-contactlist)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-contactlist/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-ktp-contactlist.desktop)
diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
similarity index 98%
rename from contactlist/org.kde.ktp-contactlist/metadata.desktop
rename to contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 137b4c5..dd70bc8 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -89,7 +89,7 @@ X-KDE-PluginInfo-Name=org.kde.ktp-contactlist
 X-KDE-PluginInfo-Category=Online Services
 X-KDE-PluginInfo-Author=David Edmundson
 X-KDE-PluginInfo-Email=kde at davidedmundson.co.uk
-X-KDE-PluginInfo-Version=0.5
+X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
 X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
 
 X-KDE-PluginInfo-Depends=
diff --git a/presence/CMakeLists.txt b/presence/CMakeLists.txt
index fd12ffa..e28d899 100644
--- a/presence/CMakeLists.txt
+++ b/presence/CMakeLists.txt
@@ -4,6 +4,9 @@ set(plasma_applet_ktp_presence_SRCS
     src/presence-applet.cpp
 )
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plasma-applet-ktp-presence.desktop.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/plasma-applet-ktp-presence.desktop
+               @ONLY)
 
 kde4_add_plugin(plasma_applet_ktp_presence ${plasma_applet_ktp_presence_SRCS})
 target_link_libraries(plasma_applet_ktp_presence
@@ -16,4 +19,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 ${CMAKE_CURRENT_BINARY_DIR}/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.cmake
similarity index 96%
rename from presence/plasma-applet-ktp-presence.desktop
rename to presence/plasma-applet-ktp-presence.desktop.cmake
index 3c82fd9..265c7fe 100644
--- a/presence/plasma-applet-ktp-presence.desktop
+++ b/presence/plasma-applet-ktp-presence.desktop.cmake
@@ -37,7 +37,7 @@ 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
-X-KDE-PluginInfo-Version=0.5.2
+X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
 X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=LGPL

-- 
ktp-contact-applet packaging

More information about the pkg-kde-commits mailing list