diff options
| author | Didier Roche <didier.roche@canonical.com> | 2013-06-07 08:41:20 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2013-06-07 08:41:20 +0200 |
| commit | ea81b4dde99bdf62cb970d7640c4757401b7eda2 (patch) | |
| tree | ec38cdb9b771e69d34431e72686e9d63c355bbc2 /services | |
| parent | 89d92e46c72cd574b7b9a8166b9d56ca93913054 (diff) | |
Revert the panel on upstart from ted, it doesn't respawn as expected when another service try to communicate with the panel service and the consequence is a lot of tests failing
(bzr r3365)
Diffstat (limited to 'services')
| -rw-r--r-- | services/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | services/com.canonical.Unity.Panel.Service.service.cmake | 3 | ||||
| -rw-r--r-- | services/unity-panel-service.conf.in | 10 |
3 files changed, 5 insertions, 12 deletions
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index b26377c8b..207657a66 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -51,5 +51,5 @@ add_executable(unity-panel-service ${PANEL_SOURCES}) target_link_libraries(unity-panel-service ${LIBS}) install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/) -configure_file(unity-panel-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions) +configure_file(com.canonical.Unity.Panel.Service.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Panel.Service.service) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Panel.Service.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services) diff --git a/services/com.canonical.Unity.Panel.Service.service.cmake b/services/com.canonical.Unity.Panel.Service.service.cmake new file mode 100644 index 000000000..578f86af6 --- /dev/null +++ b/services/com.canonical.Unity.Panel.Service.service.cmake @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=com.canonical.Unity.Panel.Service +Exec=${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service diff --git a/services/unity-panel-service.conf.in b/services/unity-panel-service.conf.in deleted file mode 100644 index dd81a88b6..000000000 --- a/services/unity-panel-service.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -description "Backing Service for the Unity Panel" -author "Ted Gould <ted@ubuntu.com>" - -start on started unity -stop on stopping unity - -emits indicators-loaded - -respawn -exec ${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service |