Merge lp:~jamesh/mediascanner2/bug-1353139 into lp:mediascanner2

[James Henstridge]

Update AppArmor policy to allow read access to /sys/devices/**/video4linux/video**

Update AppArmor policy to allow access to certain sysfs files needed on Manta, as described in bug 1353139.

[Jussi Pakkanen (jpakkane)]

I know nothing of security, but if Jamie says it's ok, then that's all I need. :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:265
http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-i386-ci/68

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/127/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/usr.bin.mediascanner-service-2.0'
--- debian/usr.bin.mediascanner-service-2.0	2014-08-15 13:54:20 +0000
+++ debian/usr.bin.mediascanner-service-2.0	2014-08-22 11:47:37 +0000
@@ -35,6 +35,9 @@
   /dev/devmap r,
   @{PROC}/mtk_mdp_cmdq r,
 
+  # For manta devices
+  /sys/devices/**/video4linux/video** r,
+
   /sys/kernel/debug/tracing/trace_marker w,
   /dev/ashmem rw,