camera-app

Merge lp:~fboucault/camera-app/bump_framework_15_04_2 into lp:camera-app

  1. bump_framework_15_04_2
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 599
Merged at revision: 606
Proposed branch: lp:~fboucault/camera-app/bump_framework_15_04_2
Merge into: lp:camera-app
Diff against target: 24 lines (+2/-2)
2 files modified
camera.apparmor (+1/-1)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~fboucault/camera-app/bump_framework_15_04_2
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+278156@code.launchpad.net

Commit message

Added missing bump of framework version to ubuntu-sdk-15.04.2 necessary since we migrated to Ubuntu UI Toolkit 1.3

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/camera-app-ci/468/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/164
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/164
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/322
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/824
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25337

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/468/rebuild

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

FAILED: Continuous integration, rev:597
http://jenkins.qa.ubuntu.com/job/camera-app-ci/470/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/166
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/325
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/986
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/829
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25414

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/470/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'camera.apparmor'
--- camera.apparmor 2015-11-18 06:44:35 +0000
+++ camera.apparmor 2015-11-24 13:54:53 +0000
@@ -10,7 +10,7 @@
10 "content_exchange_source",10 "content_exchange_source",
11 "location"11 "location"
12 ],12 ],
13 "policy_version": 1.2,13 "policy_version": 1.3,
14 "read_path": [14 "read_path": [
15 "@{PROC}/*/mounts",15 "@{PROC}/*/mounts",
16 "/dev/disk/by-label/"16 "/dev/disk/by-label/"
1717
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-11-18 06:44:35 +0000
+++ manifest.json.in 2015-11-24 13:54:53 +0000
@@ -1,6 +1,6 @@
1{1{
2 "description": "An application to take pictures and videos with the device cameras",2 "description": "An application to take pictures and videos with the device cameras",
3 "framework": "ubuntu-sdk-14.10",3 "framework": "ubuntu-sdk-15.04.2",
4 "architecture": "@CLICK_ARCH@",4 "architecture": "@CLICK_ARCH@",
5 "hooks": {5 "hooks": {
6 "camera": {6 "camera": {

Subscribers

People subscribed via source and target branches