Maya

Merge lp:~lains/maya/fix-appid into lp:~elementary-apps/maya/trunk

  1. fix-appid
  2. Merge into trunk
Proposed by Lains
Status: Merged
Approved by: Danielle Foré
Approved revision: 956
Merged at revision: 962
Proposed branch: lp:~lains/maya/fix-appid
Merge into: lp:~elementary-apps/maya/trunk
Diff against target: 63 lines (+12/-12)
3 files modified
data/CMakeLists.txt (+9/-9)
data/org.pantheon.maya.appdata.xml.in.in (+1/-1)
src/Application.vala (+2/-2)
To merge this branch: bzr merge lp:~lains/maya/fix-appid
Reviewer Review Type Date Requested Status
Felipe Escoto (community) on hold Approve
Review via email: mp+304586@code.launchpad.net

Commit message

Maya Calendar "org.pantheon.maya":

* Fixed filenames to the AppID name.
* Fixed code to have it point to a new AppID.

Description of the change

Maya Calendar "org.pantheon.maya":

* Fixed filenames to the AppID name.
* Fixed code to have it point to a new AppID.

To post a comment you must log in.
lp:~lains/maya/fix-appid updated
955. By Lains <email address hidden>

Fixed Maya Calendar files and code to unify it's AppID to 'org.pantheon.maya', part 2

956. By Lains <email address hidden>

Fixed Maya Calendar files and code to unify it's AppID to 'org.pantheon.maya', part 3

Revision history for this message
Felipe Escoto (philip.scott) wrote :

Approved, but on hold until Loki is out

review: Approve (on hold)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-08-14 17:28:27 +0000
3+++ data/CMakeLists.txt 2016-09-01 06:27:34 +0000
4@@ -6,19 +6,19 @@
5 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/calendar-go-today.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/actions)
6
7 # We need to create two temporary desktop files in order to have all translations available.
8-configure_file (maya-calendar.appdata.xml.in.in ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.appdata.xml.in)
9+configure_file (org.pantheon.maya.appdata.xml.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.appdata.xml.in)
10 set (APP_NAME "Calendar")
11-configure_file (maya-calendar.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.desktop.in)
12+configure_file (org.pantheon.maya.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.desktop.in)
13 set (APP_NAME "Maya")
14-configure_file (maya-calendar.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar-original.desktop.in)
15+configure_file (org.pantheon.maya.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya-original.desktop.in)
16 if (BUILD_FOR_ELEMENTARY)
17- configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.desktop ${CMAKE_SOURCE_DIR}/po/)
18+ configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.desktop ${CMAKE_SOURCE_DIR}/po/)
19 else ()
20- configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/maya-calendar-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.desktop ${CMAKE_SOURCE_DIR}/po/)
21+ configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.desktop ${CMAKE_SOURCE_DIR}/po/)
22 endif ()
23
24-configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
25+configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
26
27-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.appdata.xml DESTINATION share/appdata)
28-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/maya-calendar.desktop DESTINATION share/applications)
29-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/maya-calendar-daemon.desktop DESTINATION share/applications)
30+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.appdata.xml DESTINATION share/appdata)
31+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.maya.desktop DESTINATION share/applications)
32+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pantheon.maya-daemon.desktop DESTINATION share/applications)
33
34=== renamed file 'data/maya-calendar-daemon.desktop' => 'data/org.pantheon.maya-daemon.desktop'
35=== renamed file 'data/maya-calendar.appdata.xml.in.in' => 'data/org.pantheon.maya.appdata.xml.in.in'
36--- data/maya-calendar.appdata.xml.in.in 2016-01-18 23:25:24 +0000
37+++ data/org.pantheon.maya.appdata.xml.in.in 2016-09-01 06:27:34 +0000
38@@ -1,7 +1,7 @@
39 <?xml version="1.0" encoding="UTF-8"?>
40 <!-- Copyright 2015-2016 elementary, LLC <contact@elementary.io> -->
41 <component type="desktop">
42- <id>maya-calendar.desktop</id>
43+ <id>org.pantheon.maya.desktop</id>
44 <metadata_license>CC0-1.0</metadata_license>
45 <project_group>elementary</project_group>
46 <project_license>GPL-3.0+</project_license>
47
48=== renamed file 'data/maya-calendar.desktop.in.in' => 'data/org.pantheon.maya.desktop.in.in'
49=== modified file 'src/Application.vala'
50--- src/Application.vala 2016-07-17 09:14:30 +0000
51+++ src/Application.vala 2016-09-01 06:27:34 +0000
52@@ -76,9 +76,9 @@
53 exec_name = "maya-calendar";
54
55 app_years = "2011-2016";
56- application_id = "net.launchpad.maya";
57+ application_id = "org.pantheon.maya";
58 app_icon = "office-calendar";
59- app_launcher = "maya-calendar.desktop";
60+ app_launcher = "org.pantheon.maya.desktop";
61
62 main_url = "https://launchpad.net/maya";
63 bug_url = "https://bugs.launchpad.net/maya";

Subscribers

People subscribed via source and target branches

to all changes: