Granite

Merge lp:~codygarver/granite/granite-demo-desktop into lp:~elementary-pantheon/granite/granite

  1. granite-demo-desktop
  2. Merge into granite
Proposed by Cody Garver
Status: Merged
Approved by: Corentin Noël
Approved revision: 855
Merged at revision: 856
Proposed branch: lp:~codygarver/granite/granite-demo-desktop
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 20 lines (+8/-0)
2 files modified
demo/CMakeLists.txt (+1/-0)
demo/granite-demo.desktop (+7/-0)
To merge this branch: bzr merge lp:~codygarver/granite/granite-demo-desktop
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+259231@code.launchpad.net

Commit message

Install a basic .desktop for granite-demo

Description of the change

So granite-demo will get a dock icon

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'demo/CMakeLists.txt'
2--- demo/CMakeLists.txt 2013-08-28 16:20:28 +0000
3+++ demo/CMakeLists.txt 2015-05-15 11:11:06 +0000
4@@ -22,3 +22,4 @@
5 add_executable (${EXEC_NAME} ${VALA_C})
6 target_link_libraries (${EXEC_NAME} ${PKG_NAME} ${DEPS_LIBRARIES})
7 install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
8+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/granite-demo.desktop DESTINATION share/applications)
9
10=== added file 'demo/granite-demo.desktop'
11--- demo/granite-demo.desktop 1970-01-01 00:00:00 +0000
12+++ demo/granite-demo.desktop 2015-05-15 11:11:06 +0000
13@@ -0,0 +1,7 @@
14+[Desktop Entry]
15+Name=Granite Demo
16+Comment=A demo of the Granite toolkit
17+Exec=granite-demo
18+Icon=applications-interfacedesign
19+Type=Application
20+NoDisplay=true

Subscribers

People subscribed via source and target branches