diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a182634..3cb704ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,5 @@ 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") -add_subdirectory(bin) add_subdirectory(qmlcomponents) add_subdirectory(services) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt deleted file mode 100644 index 9977660b..00000000 --- a/bin/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plasma-phone.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-phone) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-phone - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ GROUP_EXECUTE GROUP_READ - DESTINATION ${BIN_INSTALL_DIR}) diff --git a/bin/plasma-phone.cmake b/bin/plasma-phone.cmake deleted file mode 100644 index b71c0cf6..00000000 --- a/bin/plasma-phone.cmake +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Script that starts the Plasma phone UI. -# -# Copyright (C) 2014 Pier Luigi Fiorini -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# - -exec dbus-run-session -- /usr/bin/plasmashell -p org.kde.satellite.phone -n diff --git a/services/plasma-phone-ui.service.cmake b/services/plasma-phone-ui.service.cmake index 028a43a5..ecef78b5 100644 --- a/services/plasma-phone-ui.service.cmake +++ b/services/plasma-phone-ui.service.cmake @@ -11,7 +11,7 @@ Requires=dbus.socket plasma-phone-compositor.service [Service] Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf -ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasma-phone +ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasmashell -p org.kde.satellite.phone -n ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell Restart=on-failure BusName=org.kde.plasmashell