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

[Alan Pope 🍺🐧🐱 🦄]

fix 1401718 - update framework

[Nekhelesh Ramananthan (nik90)]

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)]

PASSED: Continuous integration, rev:404
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/315/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/110
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/23

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/315/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

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

[Victor Thompson (vthompson)]

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]

405. By Alan Pope 🍺🐧🐱 🦄 on 2015-03-10

fix it correctly

[Alan Pope 🍺🐧🐱 🦄 (popey)]

You are of course both correct, sorry.

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:405
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/316/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/111
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/24

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/316/rebuild

review: Approve (continuous-integration)

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-09-20 20:05:02 +0000
+++ click/manifest.json.in	2015-03-10 12:45:26 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "@CLICK_ARCH@",
     "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
-    "framework": "ubuntu-sdk-14.10-qml-dev3",
+    "framework": "ubuntu-sdk-14.10",
     "hooks": {
         "weather": {
             "apparmor": "weather.apparmor",