From ac4f1a714f46c84e15d836c17a3c6ba13ac425b8 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Tue, 13 Jan 2015 09:32:39 +0100
Subject: [PATCH] Install the compositor as a Green Island plugin

Green Island removed the KPackage dependency because it didn't add too
much value to justify it. QStandardPaths is enough to find plugins.

This patch installs the compositor into DATA_INSTALL_DIR/greenisland.
---
 CMakeLists.txt                                    |   8 +++++++-
 compositor/{contents => }/ClientWindowWrapper.qml |   0
 compositor/{contents => }/Compositor.qml          |   0
 compositor/{contents => }/ShellWindowWrapper.qml  |   0
 compositor/{contents => }/WindowManagement.js     |   0
 compositor/{contents => }/WindowWrapper.qml       |   0
 compositor/{contents => }/klogo.png               | Bin
 compositor/metadata.desktop                       |  14 --------------
 8 files changed, 7 insertions(+), 15 deletions(-)
 rename compositor/{contents => }/ClientWindowWrapper.qml (100%)
 rename compositor/{contents => }/Compositor.qml (100%)
 rename compositor/{contents => }/ShellWindowWrapper.qml (100%)
 rename compositor/{contents => }/WindowManagement.js (100%)
 rename compositor/{contents => }/WindowWrapper.qml (100%)
 rename compositor/{contents => }/klogo.png (100%)
 delete mode 100644 compositor/metadata.desktop

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 644ee2fb..08b3764f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,11 +33,17 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAG
 
 include(CheckIncludeFiles)
 
-plasma_install_package(compositor org.kde.satellite.compositor.phone greenisland/compositors)
 plasma_install_package(look-and-feel org.kde.satellite.phone look-and-feel)
 plasma_install_package(shell org.kde.satellite.phone shells)
 install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers")
 
+install(DIRECTORY compositor/
+        DESTINATION ${DATA_INSTALL_DIR}/greenisland/org.kde.satellite.compositor.phone
+        PATTERN .svn EXCLUDE
+        PATTERN CMakeLists.txt EXCLUDE
+        PATTERN Messages.sh EXCLUDE
+        PATTERN dummydata EXCLUDE)
+
 add_subdirectory(bin)
 add_subdirectory(qmlcomponents)
 add_subdirectory(services)
diff --git a/compositor/contents/ClientWindowWrapper.qml b/compositor/ClientWindowWrapper.qml
similarity index 100%
rename from compositor/contents/ClientWindowWrapper.qml
rename to compositor/ClientWindowWrapper.qml
diff --git a/compositor/contents/Compositor.qml b/compositor/Compositor.qml
similarity index 100%
rename from compositor/contents/Compositor.qml
rename to compositor/Compositor.qml
diff --git a/compositor/contents/ShellWindowWrapper.qml b/compositor/ShellWindowWrapper.qml
similarity index 100%
rename from compositor/contents/ShellWindowWrapper.qml
rename to compositor/ShellWindowWrapper.qml
diff --git a/compositor/contents/WindowManagement.js b/compositor/WindowManagement.js
similarity index 100%
rename from compositor/contents/WindowManagement.js
rename to compositor/WindowManagement.js
diff --git a/compositor/contents/WindowWrapper.qml b/compositor/WindowWrapper.qml
similarity index 100%
rename from compositor/contents/WindowWrapper.qml
rename to compositor/WindowWrapper.qml
diff --git a/compositor/contents/klogo.png b/compositor/klogo.png
similarity index 100%
rename from compositor/contents/klogo.png
rename to compositor/klogo.png
diff --git a/compositor/metadata.desktop b/compositor/metadata.desktop
deleted file mode 100644
index 691f7100..00000000
--- a/compositor/metadata.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=Phone
-Type=Service
-
-X-KDE-ServiceTypes=GreenIsland/Compositor
-X-KDE-ParentApp=
-X-KDE-PluginInfo-Author=Pier Luigi Fiorini
-X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Email=pierluigi.fiorini@gmail.com
-X-KDE-PluginInfo-License=GPLv2+
-X-KDE-PluginInfo-Name=org.kde.satellite.compositor.phone
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=
-