Merge lp:~renatofilho/ubuntu-calculator-app/fix-icon-snap into lp:ubuntu-calculator-app

[Renato Araujo Oliveira Filho]

Fix icon path for snap package.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:315
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/74/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/994/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/74/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

The Icon path should really be:-

Icon=${SNAP}/meta/gui/icon.png

Rather than hard wiring the /snap path, as there is no guarantee that /snap is valid on all platforms.

review: Needs Fixing

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:316
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/75/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/995/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/75/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-calculator-app/fix-icon-snap]

316. By Renato Araujo Oliveira Filho on 2016-11-22

Use $SNAP envar as icon prefix path instead of hardcoded path.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM

review: Approve

=== modified file 'setup/gui/ubuntu-calculator-app.desktop'
--- setup/gui/ubuntu-calculator-app.desktop	2016-11-10 20:06:43 +0000
+++ setup/gui/ubuntu-calculator-app.desktop	2016-11-22 15:06:41 +0000
@@ -177,7 +177,7 @@
 Keywords[zh_CN]=数学;加;减;乘;除;
 Keywords[zh_TW]=math;addition;subtraction;multiplication;division;數學;加;減;乘;除;
 Exec=ubuntu-calculator-app %u
-Icon=/snap/ubuntu-calendar-app/current/ubuntu-calculator-app.png
+Icon=${SNAP}/meta/gui/icon.png
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true