Merge lp:~cameronnemo/apparmor/abstraction-fdo-applications-fixups into lp:apparmor/2.12

[Cameron Norman]

[Christian Boltz (cboltz)]

What about merging the rules for main dir and sub dir? You'll get something like

/usr/{,local/}share/applications/{*/,} r,
/usr/{,local/}share/applications/{*/,}defaults.list r,
                                 ^^^^^

[intrigeri (intrigeri)]

Hi Cameron! Christian's suggestion makes sense to me. Are you still interested in pushing this MR forward, or should someone else take over?

review: Needs Fixing

[lp:~cameronnemo/apparmor/abstraction-fdo-applications-fixups]

3112. By Cameron Norman on 2017-07-03

Merged two rule groups

[Cameron Norman (cameronnemo)]

Made adjustments suggested

[intrigeri (intrigeri)]

Looks good to me, I would merge this. Thanks for the update!

review: Approve

[intrigeri (intrigeri)]

> Looks good to me, I would merge this. Thanks for the update!

Two months later: bump :)

[Christian Boltz (cboltz)]

Merged into trunk, 2.11, 2.10 and 2.9 branch.

[Christian Boltz (cboltz)]

review: Approve

[intrigeri (intrigeri)]

Christian Boltz:
> Merged into trunk, 2.11, 2.10 and 2.9 branch.

Thanks a lot! :)

=== modified file 'profiles/apparmor.d/abstractions/freedesktop.org'
--- profiles/apparmor.d/abstractions/freedesktop.org	2014-10-08 19:32:11 +0000
+++ profiles/apparmor.d/abstractions/freedesktop.org	2017-07-03 19:55:25 +0000
@@ -10,10 +10,10 @@
 # ------------------------------------------------------------------
 
   # system configuration
-  /usr/share/applications/               r,
-  /usr/share/applications/defaults.list  r,
-  /usr/share/applications/mimeinfo.cache r,
-  /usr/share/applications/*.desktop      r,
+  /usr/{,local/}share/applications/{*/,}               r,
+  /usr/{,local/}share/applications/{*/,}defaults.list  r,
+  /usr/{,local/}share/applications/{*/,}mimeinfo.cache r,
+  /usr/{,local/}share/applications/{*/,}*.desktop      r,
   /usr/share/icons/               r,
   /usr/share/icons/**             r,
   /usr/share/pixmaps/             r,