Merge #1291

1291: Add "Mir Shell" to the greeter r=wmww a=AlanGriffiths Co-authored-by: Alan Griffiths <[email protected]>
canonical · Feb 19, 2020 · 034af91 · 034af91
1 parent c65b9ea
commit 034af91
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/debian/mir-demos.install b/debian/mir-demos.install
@@ -3,4 +3,5 @@ usr/bin/miral-kiosk
 usr/bin/miral-app
 usr/bin/miral-system-compositor
 usr/share/applications/miral-shell.desktop
+usr/share/wayland-sessions/miral-shell.desktop
 usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
diff --git a/examples/miral-shell/desktop/CMakeLists.txt b/examples/miral-shell/desktop/CMakeLists.txt
@@ -7,6 +7,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
 )
 
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/wayland-sessions
+)
+
 install(FILES ${ICON_NAME}.svg
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
 )
diff --git a/examples/miral-shell/desktop/miral-shell.desktop.in b/examples/miral-shell/desktop/miral-shell.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
-Name=Miral Shell
+Name=Mir Shell
 GenericName=Mir Shell
-Comment=A Mir Shell
+Comment=Mir Shell: "miral-shell" Demo
 Keywords=Mir;Server;Shell
 Type=Application
 Icon=@ICON_NAME@