[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=34fcdf6

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

    [person] Adopt the same structure as the other applets
    
    This allows for setting the applet version from the main CMakeLists.txt,
    just like for the other two applets
---
 CMakeLists.txt                                                    | 3 +--
 person/CMakeLists.txt                                             | 8 ++++++++
 person/{ => org.kde.person}/contents/config/config.qml            | 0
 person/{ => org.kde.person}/contents/config/main.xml              | 0
 person/{ => org.kde.person}/contents/ui/Person.qml                | 0
 person/{ => org.kde.person}/contents/ui/main.qml                  | 0
 person/{ => org.kde.person}/contents/ui/settingsGeneral.qml       | 0
 .../{metadata.desktop => org.kde.person/metadata.desktop.cmake}   | 2 +-
 8 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f39254..c847d92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,5 +14,4 @@ include(KDECompilerSettings)
 
 add_subdirectory(chat)
 add_subdirectory(contactlist)
-
-plasma_install_package(person org.kde.person)
+add_subdirectory(person)
diff --git a/person/CMakeLists.txt b/person/CMakeLists.txt
new file mode 100644
index 0000000..007c0af
--- /dev/null
+++ b/person/CMakeLists.txt
@@ -0,0 +1,8 @@
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.kde.person/metadata.desktop.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/org.kde.person/metadata.desktop
+               @ONLY)
+
+install(DIRECTORY org.kde.person DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids PATTERN metadata.desktop.cmake EXCLUDE)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.person/metadata.desktop DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids/org.kde.person/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.person/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-org.kde.person.desktop)
diff --git a/person/contents/config/config.qml b/person/org.kde.person/contents/config/config.qml
similarity index 100%
rename from person/contents/config/config.qml
rename to person/org.kde.person/contents/config/config.qml
diff --git a/person/contents/config/main.xml b/person/org.kde.person/contents/config/main.xml
similarity index 100%
rename from person/contents/config/main.xml
rename to person/org.kde.person/contents/config/main.xml
diff --git a/person/contents/ui/Person.qml b/person/org.kde.person/contents/ui/Person.qml
similarity index 100%
rename from person/contents/ui/Person.qml
rename to person/org.kde.person/contents/ui/Person.qml
diff --git a/person/contents/ui/main.qml b/person/org.kde.person/contents/ui/main.qml
similarity index 100%
rename from person/contents/ui/main.qml
rename to person/org.kde.person/contents/ui/main.qml
diff --git a/person/contents/ui/settingsGeneral.qml b/person/org.kde.person/contents/ui/settingsGeneral.qml
similarity index 100%
rename from person/contents/ui/settingsGeneral.qml
rename to person/org.kde.person/contents/ui/settingsGeneral.qml
diff --git a/person/metadata.desktop b/person/org.kde.person/metadata.desktop.cmake
similarity index 97%
rename from person/metadata.desktop
rename to person/org.kde.person/metadata.desktop.cmake
index f1035c3..c452b8b 100644
--- a/person/metadata.desktop
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -56,7 +56,7 @@ X-Plasma-API=declarativeappletscript
 X-KDE-PluginInfo-Author=Aleix Pol Gonzalez
 X-KDE-PluginInfo-Email=aleixpol at blue-systems.com
 X-KDE-PluginInfo-Name=person
-X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Utilities
 X-KDE-PluginInfo-Depends=

-- 
ktp-contact-applet packaging