Merge ~u-d/apparmor-profiles:thunderbird/links into ~apparmor-dev/apparmor-profiles/+git/apparmor-profiles-old:master

[Ulrike Uhlig]

When clicking on links in emails, users would expect the browser to open them.

This is a patch by Douglas Bagnall <email address hidden> for XFCE.
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853929

[intrigeri (intrigeri)]

This looks alright to me, I would merge it! Note that there's some overlap with https://code.launchpad.net/~u-d/apparmor-profiles/+git/apparmor-profiles/+merge/320276 so the other MR will need updating once the other is merged.

review: Approve

[intrigeri (intrigeri)]

FTR https://code.launchpad.net/~sdeziel/apparmor-profiles/+git/apparmor-profiles/+merge/330183 is a superset of this MR, so if/once Simon's one is merged we can close this one as obsolete.

[Steve Beattie (sbeattie)]

Looks good. I went ahead and merged this, even though it was a subset of Simon's branch, just to get the origins/credit correct. I forget to amend my commit message before pushing, but I also copied the changes to the 17.10 branch (which didn't exist when the merge request was originally made :/ ).

Thanks again, and my apologies for the delay!

review: Approve

diff --git a/ubuntu/17.04/usr.bin.thunderbird b/ubuntu/17.04/usr.bin.thunderbird
index e74e9f5..4cbf708 100644
--- a/ubuntu/17.04/usr.bin.thunderbird
+++ b/ubuntu/17.04/usr.bin.thunderbird
@@ -175,6 +175,12 @@ profile thunderbird /usr/lib/thunderbird/thunderbird {
   /{usr/,}bin/uname Uxr,
   /usr/bin/locale Uxr,
 
+  # For Xubuntu to launch the browser
+  /usr/bin/exo-open ixr,
+  /usr/lib/@{multiarch}/xfce4/exo-1/exo-helper-1 ixr,
+  /etc/xdg/xdg-xubuntu/xfce4/helpers.rc r,
+  /etc/xdg/xfce4/helpers.rc r,
+
   /usr/bin/gpg Cx -> gpg,
 
   profile gpg {