Merge lp:~nonamenoname/switchboard-plug-about/fix-1084101 into lp:~elementary-apps/switchboard-plug-about/trunk

Proposed by No Name
Status: Merged
Approved by: Corentin Noël
Approved revision: 164
Merged at revision: 161
Proposed branch: lp:~nonamenoname/switchboard-plug-about/fix-1084101
Merge into: lp:~elementary-apps/switchboard-plug-about/trunk
Diff against target: 30 lines (+14/-0)
2 files modified
CMakeLists.txt (+2/-0)
data/pantheon-plug-about.desktop (+12/-0)
To merge this branch: bzr merge lp:~nonamenoname/switchboard-plug-about/fix-1084101
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+217131@code.launchpad.net

Commit message

added desktop file

To post a comment you must log in.
163. By Simon Dieterle <email address hidden>

fix install dir

164. By Simon Dieterle <email address hidden>

removed X-Ubuntu

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-01-06 16:38:56 +0000
3+++ CMakeLists.txt 2014-04-24 22:35:57 +0000
4@@ -42,6 +42,8 @@
5 # Files
6 file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
7
8+install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-plug-about.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
9+
10 # Traslation stuff
11 add_subdirectory (po)
12 # Info-plug
13
14=== added file 'data/pantheon-plug-about.desktop'
15--- data/pantheon-plug-about.desktop 1970-01-01 00:00:00 +0000
16+++ data/pantheon-plug-about.desktop 2014-04-24 22:35:57 +0000
17@@ -0,0 +1,12 @@
18+[Desktop Entry]
19+Name=About
20+Comment=Shows System Informations…
21+Exec=switchboard -o system-pantheon-about
22+Icon=help-info
23+Terminal=false
24+Type=Application
25+StartupNotify=true
26+Categories=X-PANTHEON-Switchboard-Plugs;
27+OnlyShowIn=Pantheon;
28+Keywords=About;Info;
29+X-GNOME-Gettext-Domain=switchboard
30\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: