Merge lp:~jhodapp/camera-app/adjust-policy-groups into lp:camera-app

[Jim Hodapp]

Update the app_armor policy groups and framework verion so that the camera-app can continue to write snapshots and video files to ~/Pictures and ~/Videos respectively

Update the app_armor policy groups and framework verion so that the camera-app can continue to write snapshots and video files to ~/Pictures and ~/Videos respectively

[Jamie Strandboge (jdstrand)]

Looks good!

review: Approve

[Sergio Schvezov (sergiusens)]

This isn't necessarily needing of landing through the ci train; t's fine to manually merge, there is no way to test this correctly through the train (except desktop)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/camera-app-ci/211/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/122
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/176
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8912
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1261
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1261/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'click/camera-apparmor.json'
--- click/camera-apparmor.json	2014-03-14 17:33:54 +0000
+++ click/camera-apparmor.json	2014-06-26 20:49:13 +0000
@@ -1,8 +1,9 @@
 {
     "policy_groups": ["picture_files",
+                      "video_files",
                       "camera",
                       "audio",
                       "usermetrics"
                       ], 
-    "policy_version": 1.1
+    "policy_version": 1.2
 }

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-05-07 14:52:27 +0000
+++ click/manifest.json.in	2014-06-26 20:49:13 +0000
@@ -1,7 +1,7 @@
 {
     "description": 
         "An application to take pictures and videos with the device cameras",
-    "framework": "ubuntu-sdk-14.04-dev1", 
+    "framework": "ubuntu-sdk-14.10-dev2", 
     "architecture": "armhf",
     "hooks": {
         "camera": {