Merge lp:~bfiller/gallery-app/fix-security-version into lp:gallery-app

Proposed by Bill Filler
Status: Merged
Approved by: Colin Watson
Approved revision: 1026
Merged at revision: 1022
Proposed branch: lp:~bfiller/gallery-app/fix-security-version
Merge into: lp:gallery-app
Diff against target: 43 lines (+3/-6)
3 files modified
click/gallery-apparmor.json (+2/-4)
click/manifest.json.in (+1/-1)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~bfiller/gallery-app/fix-security-version
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy Pending
Review via email: mp+228373@code.launchpad.net

This proposal supersedes a proposal from 2014-07-25.

Commit message

bump framework and security version of the click package

Description of the change

The most recent gallery-app upload to the store was rejected due to using a deprecated framework. David Planella tells me that the community core apps are using ubuntu-sdk-14.10-dev2 at the moment, so let's update to that.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote : Posted in a previous version of this proposal

The change looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote : Posted in a previous version of this proposal

Did some investigating, and the problem is the click won't launch because we need to bump the security version to 1.2 as this is required for the ubuntu-sdk-14.10-dev2 framework. I'll fix and resubmit MR

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1024. By Bill Filler

removed friends from policy as that's not supported anymore

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1025. By Bill Filler

no longer needs accounts policy as it now uses content-hub

1026. By Bill Filler

get rid of depends for qtdeclarative5-accounts-plugin, as it's not needed

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Colin Watson (cjwatson) wrote :

Top-approving per Bill's mail to me this morning.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/gallery-apparmor.json'
2--- click/gallery-apparmor.json 2014-03-14 17:51:09 +0000
3+++ click/gallery-apparmor.json 2014-07-26 03:13:12 +0000
4@@ -1,12 +1,10 @@
5 {
6- "policy_groups": ["accounts",
7- "audio",
8+ "policy_groups": ["audio",
9 "content_exchange",
10 "content_exchange_source",
11 "picture_files",
12- "friends",
13 "video",
14 "video_files"
15 ],
16- "policy_version": 1.1
17+ "policy_version": 1.2
18 }
19
20=== modified file 'click/manifest.json.in'
21--- click/manifest.json.in 2014-05-07 14:50:40 +0000
22+++ click/manifest.json.in 2014-07-26 03:13:12 +0000
23@@ -1,7 +1,7 @@
24 {
25 "description":
26 "Gallery application for your photo collection",
27- "framework": "ubuntu-sdk-14.04-dev1",
28+ "framework": "ubuntu-sdk-14.10-dev2",
29 "architecture": "armhf",
30 "hooks": {
31 "gallery": {
32
33=== modified file 'debian/control'
34--- debian/control 2014-07-18 08:20:10 +0000
35+++ debian/control 2014-07-26 03:13:12 +0000
36@@ -32,7 +32,6 @@
37 Conflicts: ubuntu-gallery
38 Depends: ${misc:Depends},
39 ${shlibs:Depends},
40- qtdeclarative5-accounts-plugin,
41 libqt5sql5-sqlite,
42 qtdeclarative5-qtquick2-plugin,
43 qml-module-qtmultimedia | qml-module-qtmultimedia-gles,

Subscribers

People subscribed via source and target branches