Ubuntu Weather App

Merge lp:~popey/ubuntu-weather-app/fix-1401718 into lp:ubuntu-weather-app/obsolete.trunk

  1. fix-1401718
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄 on 2015-03-09
Status: Merged
Approved by: Nekhelesh Ramananthan on 2015-03-10
Approved revision: 405
Merged at revision: 404
Proposed branch: lp:~popey/ubuntu-weather-app/fix-1401718
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 12 lines (+1/-1)
1 file modified
click/manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~popey/ubuntu-weather-app/fix-1401718
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-03-10
Nekhelesh Ramananthan (community) 2015-03-09 Approve on 2015-03-10
Victor Thompson Needs Information on 2015-03-10
Review via email: mp+252361@code.launchpad.net

Commit Message

fix 1401718 - update framework

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

I believe since weather app has a c++ plugin, the framework should be "ubuntu-sdk-14.10". Clock and docviwer does the same in this regard.

review: Needs Fixing
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

@nik90
This merge is for "ye olde" colourful weather app, not the new one. It's pure QML.

Victor Thompson (vthompson) wrote :

Popey, there is a TimeZone plugin in the current version in trunk [1]. Perhaps the framework simply wasn't updated when the plugin was added [2]? I think nik90 is right and going forward the app should use the non-qml framework.

1 - http://bazaar.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk/files/head:/plugins/TimeZone/
2 - http://bazaar.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk/revision/376

review: Needs Information
lp:~popey/ubuntu-weather-app/fix-1401718 updated on 2015-03-10
405. By Alan Pope 🍺🐧🐱 🦄 on 2015-03-10

fix it correctly

Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

You are of course both correct, sorry.

Nekhelesh Ramananthan (nik90) wrote :

lgtm!

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/manifest.json.in'
2--- click/manifest.json.in 2014-09-20 20:05:02 +0000
3+++ click/manifest.json.in 2015-03-10 12:45:26 +0000
4@@ -1,7 +1,7 @@
5 {
6 "architecture": "@CLICK_ARCH@",
7 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
8- "framework": "ubuntu-sdk-14.10-qml-dev3",
9+ "framework": "ubuntu-sdk-14.10",
10 "hooks": {
11 "weather": {
12 "apparmor": "weather.apparmor",

Subscribers

People subscribed via source and target branches