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

The following commit has been merged in the master branch:
commit e71eaf5d18db9334daff7738dedf06fea28adb5e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 2 15:35:42 2015 +0100

    Remove double // from install paths
---
 chat/CMakeLists.txt        | 2 +-
 contactlist/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chat/CMakeLists.txt b/chat/CMakeLists.txt
index 22e151d..f321ead 100644
--- a/chat/CMakeLists.txt
+++ b/chat/CMakeLists.txt
@@ -2,7 +2,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.kde.ktp-chat/metadata.desktop.cma
                ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop
                @ONLY)
 
-install(DIRECTORY org.kde.ktp-chat DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids/ PATTERN metadata.desktop.cmake EXCLUDE)
+install(DIRECTORY org.kde.ktp-chat DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids PATTERN metadata.desktop.cmake EXCLUDE)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids/org.kde.ktp-chat/)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-org.kde.ktp-chat.desktop)
diff --git a/contactlist/CMakeLists.txt b/contactlist/CMakeLists.txt
index 4f7fea0..7279d01 100644
--- a/contactlist/CMakeLists.txt
+++ b/contactlist/CMakeLists.txt
@@ -2,6 +2,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.kde.ktp-contactlist/metadata.desk
                ${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(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-org.kde.ktp-contactlist.desktop)

-- 
ktp-contact-applet packaging