Maya

Merge lp:~b-beelitz/maya/fix-1082367 into lp:~elementary-apps/maya/trunk

  1. fix-1082367
  2. Merge into trunk
Proposed by Benjamin Beelitz
Status: Merged
Merged at revision: 397
Proposed branch: lp:~b-beelitz/maya/fix-1082367
Merge into: lp:~elementary-apps/maya/trunk
Diff against target: 35 lines (+4/-4)
2 files modified
CMakeLists.txt (+2/-2)
data/maya.desktop (+2/-2)
To merge this branch: bzr merge lp:~b-beelitz/maya/fix-1082367
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+141363@code.launchpad.net

Description of the change

Renamed the maya executable to maya-calendar. I hope that was all executable names in the project. Maybe there are some dependencies in other elementary projects? I don't know it.

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

Great! Thanks!

review: Approve

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 2012-11-20 12:36:36 +0000
3+++ CMakeLists.txt 2012-12-27 15:34:22 +0000
4@@ -145,9 +145,9 @@
5 )
6
7 add_definitions(${CFLAGS} -Wall -Winit-self -Wwrite-strings -Wunreachable-code -Wstrict-prototypes )
8-add_executable(maya ${VALA_C})
9+add_executable(maya-calendar ${VALA_C})
10
11-install(TARGETS maya RUNTIME DESTINATION bin)
12+install(TARGETS maya-calendar RUNTIME DESTINATION bin)
13
14 #
15 # GSettings Schema
16
17=== modified file 'data/maya.desktop'
18--- data/maya.desktop 2012-11-09 21:43:42 +0000
19+++ data/maya.desktop 2012-12-27 15:34:22 +0000
20@@ -4,7 +4,7 @@
21 Name=Maya
22 GenericName=Calendar
23 Comment=View and schedule events
24-Exec=maya
25+Exec=maya-calendar
26 Icon=office-calendar
27 Terminal=false
28 Categories=GTK;Office;Calendar;
29@@ -16,5 +16,5 @@
30
31 [AddEvent Shortcut Group]
32 Name=_Add Event
33-Exec=maya -a
34+Exec=maya-calendar -a
35 TargetEnvironment=Unity

Subscribers

People subscribed via source and target branches