Calculator

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

  1. fix-appid
  2. Merge into trunk
Proposed by Lains
Status: Merged
Approved by: Danielle Foré
Approved revision: 271
Merged at revision: 276
Proposed branch: lp:~lains/pantheon-calculator/fix-appid
Merge into: lp:~elementary-apps/pantheon-calculator/trunk
Diff against target: 41 lines (+7/-7)
3 files modified
data/CMakeLists.txt (+5/-5)
data/org.pantheon.calculator.appdata.xml.in (+1/-1)
src/PantheonCalculator.vala (+1/-1)
To merge this branch: bzr merge lp:~lains/pantheon-calculator/fix-appid
Reviewer Review Type Date Requested Status
Felipe Escoto (community) on hold Needs Fixing
Review via email: mp+304596@code.launchpad.net

Commit message

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

Description of the change

Pantheon Calculator "org.pantheon.calculator":

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

To post a comment you must log in.
Revision history for this message
Felipe Escoto (philip.scott) wrote :

Approved, but on hold until Loki is out

review: Needs Fixing (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-05-25 22:04:44 +0000
3+++ data/CMakeLists.txt 2016-09-01 06:59:15 +0000
4@@ -1,5 +1,5 @@
5-configure_file (pantheon-calculator.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop.in)
6-configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop ${CMAKE_SOURCE_DIR}/po/)
7-configure_file_translation (${CMAKE_CURRENT_SOURCE_DIR}/pantheon-calculator.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
8-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop DESTINATION share/applications)
9-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.appdata.xml DESTINATION share/appdata)
10+configure_file (org.pantheon.calculator.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop.in)
11+configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop ${CMAKE_SOURCE_DIR}/po/)
12+configure_file_translation (${CMAKE_CURRENT_SOURCE_DIR}/org.pantheon.calculator.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
13+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop DESTINATION share/applications)
14+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.appdata.xml DESTINATION share/appdata)
15
16=== renamed file 'data/pantheon-calculator.appdata.xml.in' => 'data/org.pantheon.calculator.appdata.xml.in'
17--- data/pantheon-calculator.appdata.xml.in 2016-08-02 20:40:34 +0000
18+++ data/org.pantheon.calculator.appdata.xml.in 2016-09-01 06:59:15 +0000
19@@ -1,7 +1,7 @@
20 <?xml version="1.0" encoding="UTF-8"?>
21 <!-- Copyright 2015-2016 elementary, LLC <contact@elementary.io> -->
22 <component type="desktop">
23- <id>pantheon-calculator.desktop</id>
24+ <id>org.pantheon.calculator.desktop</id>
25 <metadata_license>CC0-1.0</metadata_license>
26 <project_group>elementary</project_group>
27 <project_license>GPL-3.0+</project_license>
28
29=== renamed file 'data/pantheon-calculator.desktop.in.in' => 'data/org.pantheon.calculator.desktop.in.in'
30=== modified file 'src/PantheonCalculator.vala'
31--- src/PantheonCalculator.vala 2016-07-16 23:42:21 +0000
32+++ src/PantheonCalculator.vala 2016-09-01 06:59:15 +0000
33@@ -34,7 +34,7 @@
34 build_version = Build.VERSION;
35 build_version_info = Build.VERSION_INFO;
36
37- app_launcher = "pantheon-calculator.desktop";
38+ app_launcher = "org.pantheon.calculator.desktop";
39 main_url = "https://launchpad.net/pantheon-calculator";
40 bug_url = "https://bugs.launchpad.net/pantheon-calculator";
41 help_url = "https://answers.launchpad.net/pantheon-calculator";

Subscribers

People subscribed via source and target branches

to all changes: