[iortcw] 01/04: AppArmor: Use <abstractions/wayland> from apparmor (>= 2.10.95-5) instead of reinventing it

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository iortcw.

commit 9bbffd02852d1c5eac4c2fca5bdbe02d6cd04e3a
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jan 11 10:12:00 2018 +0000

    AppArmor: Use <abstractions/wayland> from apparmor (>= 2.10.95-5) instead of reinventing it
---
 debian/apparmor.d/usr.lib.rtcw | 7 ++-----
 debian/changelog               | 2 ++
 debian/control                 | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/apparmor.d/usr.lib.rtcw b/debian/apparmor.d/usr.lib.rtcw
index 170bef1..f68b085 100644
--- a/debian/apparmor.d/usr.lib.rtcw
+++ b/debian/apparmor.d/usr.lib.rtcw
@@ -13,6 +13,7 @@
   #include <abstractions/nameservice>
   #include <abstractions/nvidia>
   #include <abstractions/private-files-strict>
+  #include <abstractions/wayland>
 
   network inet dgram,
   network inet stream,
@@ -57,9 +58,6 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
-  # Shared memory buffers used in Wayland
-  owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
-
   # OpenAL resources
   /usr/share/openal/{,**} r,
 
@@ -68,6 +66,7 @@
     #include <abstractions/base>
     #include <abstractions/fonts>
     #include <abstractions/freedesktop.org>
+    #include <abstractions/wayland>
 
     /etc/X11/app-defaults/Xmessage-color r,
     /usr/bin/kdialog mr,
@@ -77,8 +76,6 @@
     /usr/share/themes/** r,
     /usr/share/zenity/** r,
     owner @{HOME}/.config/gtk-3.0/settings.ini r,
-
-    owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
   }
 
   # Site-specific additions and overrides. See local/README for details.
diff --git a/debian/changelog b/debian/changelog
index 42a8615..97eac65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ iortcw (1.51.b+dfsg1-3) UNRELEASED; urgency=medium
 
   * Declare compliance with Debian Policy 4.1.3
   * Replace kde-baseapps-bin dependency with kdialog (see #885839)
+  * AppArmor: Use <abstractions/wayland> from apparmor (>= 2.10.95-5)
+    instead of reinventing it
 
  -- Simon McVittie <smcv at debian.org>  Sun, 10 Dec 2017 18:55:56 +0000
 
diff --git a/debian/control b/debian/control
index 2c2fe46..75af7ca 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,8 @@ Depends:
  ${shlibs:Depends},
 Recommends:
  x11-utils | zenity | kdialog,
+Breaks:
+ apparmor (<< 2.10.95-5~),
 Description: game engine for Return to Castle Wolfenstein
  Return to Castle Wolfenstein is a military- and occult-themed first-person
  shooter game in a Second World War setting, originally released in 2001.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git