Rebase below mentioned patches

debian/patches/Allow-for-access-to-the-mutter-shared-keymap.patch
debian/patches/Extend-abstractions-X-to-account-for-Wayland-clients.patch
debian/patches/abstractions-base-stop-working-around-LP-359338.patch

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>

debian/patches/Allow-for-access-to-the-mutter-shared-keymap.patch

@@ -14,14 +14,14 @@ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
  profiles/apparmor.d/abstractions/wayland | 3 +++
  1 file changed, 3 insertions(+)
 
-Index: apparmor-2.13.2/profiles/apparmor.d/abstractions/wayland
-===================================================================
---- apparmor-2.13.2.orig/profiles/apparmor.d/abstractions/wayland
-+++ apparmor-2.13.2/profiles/apparmor.d/abstractions/wayland
-@@ -12,3 +12,6 @@
-   owner /var/run/user/*/weston-shared-* rw,
-   owner /run/user/*/wayland-[0-9]* rw,
-   owner /run/user/*/{mesa,mutter,sdl,wayland-cursor,weston,xwayland}-shared-* rw,
-+
+--- a/profiles/apparmor.d/abstractions/wayland
++++ b/profiles/apparmor.d/abstractions/wayland
+@@ -14,5 +14,8 @@
+   owner @{run}/user/*/wayland-[0-9]* rw,
+   owner @{run}/user/*/{mesa,mutter,sdl,wayland-cursor,weston,xwayland}-shared-* rw,
+ 
 +  # Needed for mutter, as it passes the keyboard map this way
 +  /tmp/mutter-* rw,
++
+   # Include additions to the abstraction
+   include if exists <abstractions/wayland.d>

debian/patches/Extend-abstractions-X-to-account-for-Wayland-clients.patch

@@ -11,10 +11,13 @@ Differential Revision: https://phabricator.apertis.org/D3629
 
 --- a/profiles/apparmor.d/abstractions/X
 +++ b/profiles/apparmor.d/abstractions/X
-@@ -70,3 +70,6 @@
+@@ -72,5 +72,9 @@
    # Xwayland
-   owner /run/user/*/.mutter-Xwaylandauth.* r,
+   owner @{run}/user/*/.mutter-Xwaylandauth.* r,
  
 +  # Wayland and friends
 +  owner /run/user/*/wayland-0 rw,
 +  owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
++
+   # Include additions to the abstraction
+   include if exists <abstractions/X.d>

debian/patches/abstractions-base-stop-working-around-LP-359338.patch

@@ -12,7 +12,7 @@ This partially reverts commit 464d426095d7fe0a7061c8ad024851ac6278c310.
 
 --- a/profiles/apparmor.d/abstractions/base
 +++ b/profiles/apparmor.d/abstractions/base
-@@ -149,20 +149,3 @@
+@@ -157,23 +157,5 @@
    # Allow us to getattr, getopt, setop and shutdown on unix sockets
    unix (getattr, getopt, setopt, shutdown),
  
@@ -33,3 +33,6 @@ This partially reverts commit 464d426095d7fe0a7061c8ad024851ac6278c310.
 -  owner @{HOMEDIRS}/.ecryptfs/*/.Private/ r,
 -  owner @{HOMEDIRS}/.ecryptfs/*/.Private/** mrixwlk,
 -
+-
+   # Include additions to the abstraction
+   include if exists <abstractions/base.d>