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

Proposed by Andrew Hayzen on 2016-12-17
Status: Merged
Approved by: Pat McGowan on 2017-01-11
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 on 2017-01-11
Pat McGowan 2016-12-17 Approve on 2017-01-11
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.
Pat McGowan (pat-mcgowan) wrote :

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

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup/gui/ubuntu-weather-app.desktop'
2--- setup/gui/ubuntu-weather-app.desktop 2016-11-24 10:59:52 +0000
3+++ setup/gui/ubuntu-weather-app.desktop 2016-12-17 15:46:50 +0000
4@@ -3,7 +3,7 @@
5 Type=Application
6 Terminal=false
7 Exec=ubuntu-weather-app %u
8-Icon=/snap/ubuntu-weather-app/current/meta/gui/icon.png
9+Icon=${SNAP}/meta/gui/icon.png
10 Name=Weather
11 Name[aa]=Deesaasa
12 Name[am]=የ አየር ንብረት
13
14=== modified file 'snapcraft.yaml'
15--- snapcraft.yaml 2016-11-24 03:45:31 +0000
16+++ snapcraft.yaml 2016-12-17 15:46:50 +0000
17@@ -4,13 +4,19 @@
18 description: |
19 A weather forecast application for Ubuntu with support for multiple online weather data sources.
20 grade: devel
21-confinement: devmode
22+confinement: strict
23 architectures: [all]
24
25 apps:
26 ubuntu-weather-app:
27 command: desktop-launch qmlscene --desktop_file_hint=unity8 $SNAP/usr/share/ubuntu-weather-app/app/ubuntu-weather-app.qml
28- plugs: [unity7, platform, opengl, home, gsettings]
29+ plugs:
30+ - network
31+ - location-observe
32+ - opengl
33+ - platform
34+ - unity7
35+ - unity8
36
37 plugs:
38 platform:
39@@ -20,14 +26,15 @@
40 default-provider: ubuntu-app-platform
41
42 parts:
43- ubuntu-weather-app:
44- plugin: cmake
45- configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
46- source: .
47- build-packages:
48- - cmake
49- - intltool
50- after: [desktop-ubuntu-app-platform]
51- environment:
52- source: snap/
53- plugin: dump
54+ ubuntu-weather-app:
55+ plugin: cmake
56+ configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
57+ source: .
58+ build-packages:
59+ - cmake
60+ - intltool
61+ after: [desktop-ubuntu-app-platform]
62+
63+ environment:
64+ source: snap/
65+ plugin: dump

Subscribers

People subscribed via source and target branches

to all changes: