Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1401718-framework-version into lp:ubuntu-docviewer-app/trunk

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 50
Merged at revision: 49
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1401718-framework-version
Merge into: lp:ubuntu-docviewer-app/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1401718-framework-version
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Document Viewer Developers Pending
Review via email: mp+246755@code.launchpad.net

Commit message

Update framework to 'ubuntu-sdk-14.10'

Description of the change

Update framework to 'ubuntu-sdk-14.10'

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

8 - "framework": "ubuntu-sdk-14.10-qml-dev3",
9 + "framework": "ubuntu-sdk-14.10-qml",

Considering that the docviewer app has c++ plugins that need to be built, the correct ubuntu sdk framework is "ubuntu-sdk-14.10". This is also what the clock app, filemanager app which make use of c++ plugins use.

review: Needs Fixing
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

Missed that, I'll fix ASAP

50. By Stefano Verzegnassi

Update framework to 'ubuntu-sdk-14.10

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

LGTM. Thnx! Feel free to top-approve as I don't have the permissions to do so.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json.in'
2--- manifest.json.in 2014-11-10 19:59:58 +0000
3+++ manifest.json.in 2015-01-21 15:41:58 +0000
4@@ -2,7 +2,7 @@
5 "name": "com.ubuntu.docviewer",
6 "title": "Document Viewer",
7 "description": "Document Viewer application for Ubuntu devices",
8- "framework": "ubuntu-sdk-14.10-qml-dev3",
9+ "framework": "ubuntu-sdk-14.10",
10 "architecture": "@CLICK_ARCH@",
11 "icon": "@ICON@",
12 "hooks": {

Subscribers

People subscribed via source and target branches