Merge lp:~ahayzen/ubuntu-weather-app/finish-snapcraft-implementation-001 into lp:ubuntu-weather-app

Proposed by Andrew Hayzen
Status: Merged
Approved by: Pat McGowan
Approved revision: 253
Merged at revision: 256
Proposed branch: lp:~ahayzen/ubuntu-weather-app/finish-snapcraft-implementation-001
Merge into: lp:ubuntu-weather-app
Diff against target: 65 lines (+21/-14)
2 files modified
setup/gui/ubuntu-weather-app.desktop (+1/-1)
snapcraft.yaml (+20/-13)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-weather-app/finish-snapcraft-implementation-001
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Pat McGowan Approve
Review via email: mp+313490@code.launchpad.net

Commit message

* Add correct plugs to work when confined
* Correct path for icon in desktop file

Description of the change

* Add correct plugs to work when confined
* Correct path for icon in desktop file

Note that you have to inject the API keys into the app/data/keys.js before running snapcraft.

To post a comment you must log in.
Revision history for this message
Pat McGowan (pat-mcgowan) wrote :

Reviewed the yaml, built and tested snap under unity7 desktop, lgtm

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'setup/gui/ubuntu-weather-app.desktop'
--- setup/gui/ubuntu-weather-app.desktop 2016-11-24 10:59:52 +0000
+++ setup/gui/ubuntu-weather-app.desktop 2016-12-17 15:46:50 +0000
@@ -3,7 +3,7 @@
3Type=Application3Type=Application
4Terminal=false4Terminal=false
5Exec=ubuntu-weather-app %u5Exec=ubuntu-weather-app %u
6Icon=/snap/ubuntu-weather-app/current/meta/gui/icon.png6Icon=${SNAP}/meta/gui/icon.png
7Name=Weather7Name=Weather
8Name[aa]=Deesaasa8Name[aa]=Deesaasa
9Name[am]=የ አየር ንብረት9Name[am]=የ አየር ንብረት
1010
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml 2016-11-24 03:45:31 +0000
+++ snapcraft.yaml 2016-12-17 15:46:50 +0000
@@ -4,13 +4,19 @@
4description: |4description: |
5 A weather forecast application for Ubuntu with support for multiple online weather data sources.5 A weather forecast application for Ubuntu with support for multiple online weather data sources.
6grade: devel6grade: devel
7confinement: devmode7confinement: strict
8architectures: [all]8architectures: [all]
99
10apps:10apps:
11 ubuntu-weather-app:11 ubuntu-weather-app:
12 command: desktop-launch qmlscene --desktop_file_hint=unity8 $SNAP/usr/share/ubuntu-weather-app/app/ubuntu-weather-app.qml 12 command: desktop-launch qmlscene --desktop_file_hint=unity8 $SNAP/usr/share/ubuntu-weather-app/app/ubuntu-weather-app.qml
13 plugs: [unity7, platform, opengl, home, gsettings]13 plugs:
14 - network
15 - location-observe
16 - opengl
17 - platform
18 - unity7
19 - unity8
1420
15plugs:21plugs:
16 platform:22 platform:
@@ -20,14 +26,15 @@
20 default-provider: ubuntu-app-platform26 default-provider: ubuntu-app-platform
2127
22parts:28parts:
23 ubuntu-weather-app:29 ubuntu-weather-app:
24 plugin: cmake30 plugin: cmake
25 configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]31 configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
26 source: .32 source: .
27 build-packages:33 build-packages:
28 - cmake34 - cmake
29 - intltool35 - intltool
30 after: [desktop-ubuntu-app-platform]36 after: [desktop-ubuntu-app-platform]
31 environment:37
32 source: snap/38 environment:
33 plugin: dump39 source: snap/
40 plugin: dump

Subscribers

People subscribed via source and target branches

to all changes: