From 940c9de08327c3960ef57a79f5f81fa6b3bee4c5 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sat, 7 May 2022 13:18:36 +0100
Subject: [PATCH] chore: reorganise the freedesktop group.

---
 apparmor.d/groups/{desktop => freedesktop}/accounts-daemon        | 0
 apparmor.d/groups/{desktop => freedesktop}/at-spi-bus-launcher    | 0
 apparmor.d/groups/{desktop => freedesktop}/at-spi2-registryd      | 0
 apparmor.d/groups/{desktop => freedesktop}/colord                 | 0
 apparmor.d/groups/{desktop => freedesktop}/colord-sane            | 0
 apparmor.d/groups/{desktop => freedesktop}/colord-session         | 0
 apparmor.d/groups/{desktop => freedesktop}/cpupower               | 0
 apparmor.d/groups/{desktop => freedesktop}/dconf                  | 0
 apparmor.d/groups/{desktop => freedesktop}/dconf-editor           | 0
 apparmor.d/groups/{desktop => freedesktop}/dconf-service          | 0
 apparmor.d/{profiles-a-f => groups/freedesktop}/fc-cache          | 0
 apparmor.d/{profiles-a-f => groups/freedesktop}/fc-list           | 0
 apparmor.d/groups/{desktop => freedesktop}/geoclue                | 0
 apparmor.d/{profiles-m-r => groups/freedesktop}/pipewire          | 0
 .../{profiles-m-r => groups/freedesktop}/pipewire-media-session   | 0
 apparmor.d/{profiles-m-r => groups/freedesktop}/pipewire-pulse    | 0
 .../{profiles-m-r => groups/freedesktop}/polkit-agent-helper      | 0
 .../freedesktop}/polkit-kde-authentication-agent                  | 0
 .../freedesktop}/polkit-mate-authentication-agent                 | 0
 apparmor.d/{profiles-m-r => groups/freedesktop}/polkitd           | 0
 apparmor.d/{profiles-m-r => groups/freedesktop}/pulseaudio        | 0
 .../{profiles-s-z => groups/freedesktop}/update-desktop-database  | 0
 .../{profiles-s-z => groups/freedesktop}/update-mime-database     | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/upower            | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/upowerd           | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-dbus-proxy    | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-desktop-menu  | 0
 .../{profiles-s-z => groups/freedesktop}/xdg-desktop-portal       | 0
 .../{profiles-s-z => groups/freedesktop}/xdg-desktop-portal-gnome | 0
 .../{profiles-s-z => groups/freedesktop}/xdg-desktop-portal-gtk   | 0
 .../{profiles-s-z => groups/freedesktop}/xdg-document-portal      | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-email         | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-icon-resource | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-mime          | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-open          | 0
 .../{profiles-s-z => groups/freedesktop}/xdg-permission-store     | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-screensaver   | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-settings      | 0
 .../{profiles-s-z => groups/freedesktop}/xdg-user-dirs-update     | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xhost             | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xkbcomp           | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xorg              | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xprop             | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xrandr            | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xrdb              | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xset              | 0
 apparmor.d/{profiles-s-z => groups/freedesktop}/xsetroot          | 0
 apparmor.d/groups/{desktop => freedesktop}/xwayland               | 0
 apparmor.d/{groups/desktop => profiles-a-f}/blueman               | 0
 apparmor.d/{groups/desktop => profiles-a-f}/blueman-mechanism     | 0
 .../{groups/desktop => profiles-a-f}/blueman-rfcomm-watcher       | 0
 apparmor.d/{groups/desktop => profiles-a-f}/bluemoon              | 0
 apparmor.d/{groups/desktop => profiles-a-f}/bluetoothctl          | 0
 apparmor.d/{groups/desktop => profiles-a-f}/bluetoothd            | 0
 apparmor.d/{groups/desktop => profiles-m-r}/obex-folder-listing   | 0
 apparmor.d/{groups/desktop => profiles-m-r}/obexautofs            | 0
 apparmor.d/{groups/desktop => profiles-m-r}/obexctl               | 0
 apparmor.d/{groups/desktop => profiles-m-r}/obexd                 | 0
 apparmor.d/{groups/desktop => profiles-m-r}/obexfs                | 0
 apparmor.d/{groups/desktop => profiles-m-r}/obexpush-atd          | 0
 apparmor.d/{groups/desktop => profiles-m-r}/obexpushd             | 0
 61 files changed, 0 insertions(+), 0 deletions(-)
 rename apparmor.d/groups/{desktop => freedesktop}/accounts-daemon (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/at-spi-bus-launcher (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/at-spi2-registryd (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/colord (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/colord-sane (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/colord-session (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/cpupower (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/dconf (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/dconf-editor (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/dconf-service (100%)
 rename apparmor.d/{profiles-a-f => groups/freedesktop}/fc-cache (100%)
 rename apparmor.d/{profiles-a-f => groups/freedesktop}/fc-list (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/geoclue (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/pipewire (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/pipewire-media-session (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/pipewire-pulse (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/polkit-agent-helper (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/polkit-kde-authentication-agent (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/polkit-mate-authentication-agent (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/polkitd (100%)
 rename apparmor.d/{profiles-m-r => groups/freedesktop}/pulseaudio (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/update-desktop-database (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/update-mime-database (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/upower (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/upowerd (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-dbus-proxy (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-desktop-menu (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-desktop-portal (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-desktop-portal-gnome (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-desktop-portal-gtk (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-document-portal (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-email (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-icon-resource (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-mime (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-open (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-permission-store (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-screensaver (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-settings (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xdg-user-dirs-update (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xhost (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xkbcomp (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xorg (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xprop (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xrandr (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xrdb (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xset (100%)
 rename apparmor.d/{profiles-s-z => groups/freedesktop}/xsetroot (100%)
 rename apparmor.d/groups/{desktop => freedesktop}/xwayland (100%)
 rename apparmor.d/{groups/desktop => profiles-a-f}/blueman (100%)
 rename apparmor.d/{groups/desktop => profiles-a-f}/blueman-mechanism (100%)
 rename apparmor.d/{groups/desktop => profiles-a-f}/blueman-rfcomm-watcher (100%)
 rename apparmor.d/{groups/desktop => profiles-a-f}/bluemoon (100%)
 rename apparmor.d/{groups/desktop => profiles-a-f}/bluetoothctl (100%)
 rename apparmor.d/{groups/desktop => profiles-a-f}/bluetoothd (100%)
 rename apparmor.d/{groups/desktop => profiles-m-r}/obex-folder-listing (100%)
 rename apparmor.d/{groups/desktop => profiles-m-r}/obexautofs (100%)
 rename apparmor.d/{groups/desktop => profiles-m-r}/obexctl (100%)
 rename apparmor.d/{groups/desktop => profiles-m-r}/obexd (100%)
 rename apparmor.d/{groups/desktop => profiles-m-r}/obexfs (100%)
 rename apparmor.d/{groups/desktop => profiles-m-r}/obexpush-atd (100%)
 rename apparmor.d/{groups/desktop => profiles-m-r}/obexpushd (100%)

diff --git a/apparmor.d/groups/desktop/accounts-daemon b/apparmor.d/groups/freedesktop/accounts-daemon
similarity index 100%
rename from apparmor.d/groups/desktop/accounts-daemon
rename to apparmor.d/groups/freedesktop/accounts-daemon
diff --git a/apparmor.d/groups/desktop/at-spi-bus-launcher b/apparmor.d/groups/freedesktop/at-spi-bus-launcher
similarity index 100%
rename from apparmor.d/groups/desktop/at-spi-bus-launcher
rename to apparmor.d/groups/freedesktop/at-spi-bus-launcher
diff --git a/apparmor.d/groups/desktop/at-spi2-registryd b/apparmor.d/groups/freedesktop/at-spi2-registryd
similarity index 100%
rename from apparmor.d/groups/desktop/at-spi2-registryd
rename to apparmor.d/groups/freedesktop/at-spi2-registryd
diff --git a/apparmor.d/groups/desktop/colord b/apparmor.d/groups/freedesktop/colord
similarity index 100%
rename from apparmor.d/groups/desktop/colord
rename to apparmor.d/groups/freedesktop/colord
diff --git a/apparmor.d/groups/desktop/colord-sane b/apparmor.d/groups/freedesktop/colord-sane
similarity index 100%
rename from apparmor.d/groups/desktop/colord-sane
rename to apparmor.d/groups/freedesktop/colord-sane
diff --git a/apparmor.d/groups/desktop/colord-session b/apparmor.d/groups/freedesktop/colord-session
similarity index 100%
rename from apparmor.d/groups/desktop/colord-session
rename to apparmor.d/groups/freedesktop/colord-session
diff --git a/apparmor.d/groups/desktop/cpupower b/apparmor.d/groups/freedesktop/cpupower
similarity index 100%
rename from apparmor.d/groups/desktop/cpupower
rename to apparmor.d/groups/freedesktop/cpupower
diff --git a/apparmor.d/groups/desktop/dconf b/apparmor.d/groups/freedesktop/dconf
similarity index 100%
rename from apparmor.d/groups/desktop/dconf
rename to apparmor.d/groups/freedesktop/dconf
diff --git a/apparmor.d/groups/desktop/dconf-editor b/apparmor.d/groups/freedesktop/dconf-editor
similarity index 100%
rename from apparmor.d/groups/desktop/dconf-editor
rename to apparmor.d/groups/freedesktop/dconf-editor
diff --git a/apparmor.d/groups/desktop/dconf-service b/apparmor.d/groups/freedesktop/dconf-service
similarity index 100%
rename from apparmor.d/groups/desktop/dconf-service
rename to apparmor.d/groups/freedesktop/dconf-service
diff --git a/apparmor.d/profiles-a-f/fc-cache b/apparmor.d/groups/freedesktop/fc-cache
similarity index 100%
rename from apparmor.d/profiles-a-f/fc-cache
rename to apparmor.d/groups/freedesktop/fc-cache
diff --git a/apparmor.d/profiles-a-f/fc-list b/apparmor.d/groups/freedesktop/fc-list
similarity index 100%
rename from apparmor.d/profiles-a-f/fc-list
rename to apparmor.d/groups/freedesktop/fc-list
diff --git a/apparmor.d/groups/desktop/geoclue b/apparmor.d/groups/freedesktop/geoclue
similarity index 100%
rename from apparmor.d/groups/desktop/geoclue
rename to apparmor.d/groups/freedesktop/geoclue
diff --git a/apparmor.d/profiles-m-r/pipewire b/apparmor.d/groups/freedesktop/pipewire
similarity index 100%
rename from apparmor.d/profiles-m-r/pipewire
rename to apparmor.d/groups/freedesktop/pipewire
diff --git a/apparmor.d/profiles-m-r/pipewire-media-session b/apparmor.d/groups/freedesktop/pipewire-media-session
similarity index 100%
rename from apparmor.d/profiles-m-r/pipewire-media-session
rename to apparmor.d/groups/freedesktop/pipewire-media-session
diff --git a/apparmor.d/profiles-m-r/pipewire-pulse b/apparmor.d/groups/freedesktop/pipewire-pulse
similarity index 100%
rename from apparmor.d/profiles-m-r/pipewire-pulse
rename to apparmor.d/groups/freedesktop/pipewire-pulse
diff --git a/apparmor.d/profiles-m-r/polkit-agent-helper b/apparmor.d/groups/freedesktop/polkit-agent-helper
similarity index 100%
rename from apparmor.d/profiles-m-r/polkit-agent-helper
rename to apparmor.d/groups/freedesktop/polkit-agent-helper
diff --git a/apparmor.d/profiles-m-r/polkit-kde-authentication-agent b/apparmor.d/groups/freedesktop/polkit-kde-authentication-agent
similarity index 100%
rename from apparmor.d/profiles-m-r/polkit-kde-authentication-agent
rename to apparmor.d/groups/freedesktop/polkit-kde-authentication-agent
diff --git a/apparmor.d/profiles-m-r/polkit-mate-authentication-agent b/apparmor.d/groups/freedesktop/polkit-mate-authentication-agent
similarity index 100%
rename from apparmor.d/profiles-m-r/polkit-mate-authentication-agent
rename to apparmor.d/groups/freedesktop/polkit-mate-authentication-agent
diff --git a/apparmor.d/profiles-m-r/polkitd b/apparmor.d/groups/freedesktop/polkitd
similarity index 100%
rename from apparmor.d/profiles-m-r/polkitd
rename to apparmor.d/groups/freedesktop/polkitd
diff --git a/apparmor.d/profiles-m-r/pulseaudio b/apparmor.d/groups/freedesktop/pulseaudio
similarity index 100%
rename from apparmor.d/profiles-m-r/pulseaudio
rename to apparmor.d/groups/freedesktop/pulseaudio
diff --git a/apparmor.d/profiles-s-z/update-desktop-database b/apparmor.d/groups/freedesktop/update-desktop-database
similarity index 100%
rename from apparmor.d/profiles-s-z/update-desktop-database
rename to apparmor.d/groups/freedesktop/update-desktop-database
diff --git a/apparmor.d/profiles-s-z/update-mime-database b/apparmor.d/groups/freedesktop/update-mime-database
similarity index 100%
rename from apparmor.d/profiles-s-z/update-mime-database
rename to apparmor.d/groups/freedesktop/update-mime-database
diff --git a/apparmor.d/profiles-s-z/upower b/apparmor.d/groups/freedesktop/upower
similarity index 100%
rename from apparmor.d/profiles-s-z/upower
rename to apparmor.d/groups/freedesktop/upower
diff --git a/apparmor.d/profiles-s-z/upowerd b/apparmor.d/groups/freedesktop/upowerd
similarity index 100%
rename from apparmor.d/profiles-s-z/upowerd
rename to apparmor.d/groups/freedesktop/upowerd
diff --git a/apparmor.d/profiles-s-z/xdg-dbus-proxy b/apparmor.d/groups/freedesktop/xdg-dbus-proxy
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-dbus-proxy
rename to apparmor.d/groups/freedesktop/xdg-dbus-proxy
diff --git a/apparmor.d/profiles-s-z/xdg-desktop-menu b/apparmor.d/groups/freedesktop/xdg-desktop-menu
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-desktop-menu
rename to apparmor.d/groups/freedesktop/xdg-desktop-menu
diff --git a/apparmor.d/profiles-s-z/xdg-desktop-portal b/apparmor.d/groups/freedesktop/xdg-desktop-portal
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-desktop-portal
rename to apparmor.d/groups/freedesktop/xdg-desktop-portal
diff --git a/apparmor.d/profiles-s-z/xdg-desktop-portal-gnome b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-desktop-portal-gnome
rename to apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
diff --git a/apparmor.d/profiles-s-z/xdg-desktop-portal-gtk b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-desktop-portal-gtk
rename to apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
diff --git a/apparmor.d/profiles-s-z/xdg-document-portal b/apparmor.d/groups/freedesktop/xdg-document-portal
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-document-portal
rename to apparmor.d/groups/freedesktop/xdg-document-portal
diff --git a/apparmor.d/profiles-s-z/xdg-email b/apparmor.d/groups/freedesktop/xdg-email
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-email
rename to apparmor.d/groups/freedesktop/xdg-email
diff --git a/apparmor.d/profiles-s-z/xdg-icon-resource b/apparmor.d/groups/freedesktop/xdg-icon-resource
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-icon-resource
rename to apparmor.d/groups/freedesktop/xdg-icon-resource
diff --git a/apparmor.d/profiles-s-z/xdg-mime b/apparmor.d/groups/freedesktop/xdg-mime
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-mime
rename to apparmor.d/groups/freedesktop/xdg-mime
diff --git a/apparmor.d/profiles-s-z/xdg-open b/apparmor.d/groups/freedesktop/xdg-open
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-open
rename to apparmor.d/groups/freedesktop/xdg-open
diff --git a/apparmor.d/profiles-s-z/xdg-permission-store b/apparmor.d/groups/freedesktop/xdg-permission-store
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-permission-store
rename to apparmor.d/groups/freedesktop/xdg-permission-store
diff --git a/apparmor.d/profiles-s-z/xdg-screensaver b/apparmor.d/groups/freedesktop/xdg-screensaver
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-screensaver
rename to apparmor.d/groups/freedesktop/xdg-screensaver
diff --git a/apparmor.d/profiles-s-z/xdg-settings b/apparmor.d/groups/freedesktop/xdg-settings
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-settings
rename to apparmor.d/groups/freedesktop/xdg-settings
diff --git a/apparmor.d/profiles-s-z/xdg-user-dirs-update b/apparmor.d/groups/freedesktop/xdg-user-dirs-update
similarity index 100%
rename from apparmor.d/profiles-s-z/xdg-user-dirs-update
rename to apparmor.d/groups/freedesktop/xdg-user-dirs-update
diff --git a/apparmor.d/profiles-s-z/xhost b/apparmor.d/groups/freedesktop/xhost
similarity index 100%
rename from apparmor.d/profiles-s-z/xhost
rename to apparmor.d/groups/freedesktop/xhost
diff --git a/apparmor.d/profiles-s-z/xkbcomp b/apparmor.d/groups/freedesktop/xkbcomp
similarity index 100%
rename from apparmor.d/profiles-s-z/xkbcomp
rename to apparmor.d/groups/freedesktop/xkbcomp
diff --git a/apparmor.d/profiles-s-z/xorg b/apparmor.d/groups/freedesktop/xorg
similarity index 100%
rename from apparmor.d/profiles-s-z/xorg
rename to apparmor.d/groups/freedesktop/xorg
diff --git a/apparmor.d/profiles-s-z/xprop b/apparmor.d/groups/freedesktop/xprop
similarity index 100%
rename from apparmor.d/profiles-s-z/xprop
rename to apparmor.d/groups/freedesktop/xprop
diff --git a/apparmor.d/profiles-s-z/xrandr b/apparmor.d/groups/freedesktop/xrandr
similarity index 100%
rename from apparmor.d/profiles-s-z/xrandr
rename to apparmor.d/groups/freedesktop/xrandr
diff --git a/apparmor.d/profiles-s-z/xrdb b/apparmor.d/groups/freedesktop/xrdb
similarity index 100%
rename from apparmor.d/profiles-s-z/xrdb
rename to apparmor.d/groups/freedesktop/xrdb
diff --git a/apparmor.d/profiles-s-z/xset b/apparmor.d/groups/freedesktop/xset
similarity index 100%
rename from apparmor.d/profiles-s-z/xset
rename to apparmor.d/groups/freedesktop/xset
diff --git a/apparmor.d/profiles-s-z/xsetroot b/apparmor.d/groups/freedesktop/xsetroot
similarity index 100%
rename from apparmor.d/profiles-s-z/xsetroot
rename to apparmor.d/groups/freedesktop/xsetroot
diff --git a/apparmor.d/groups/desktop/xwayland b/apparmor.d/groups/freedesktop/xwayland
similarity index 100%
rename from apparmor.d/groups/desktop/xwayland
rename to apparmor.d/groups/freedesktop/xwayland
diff --git a/apparmor.d/groups/desktop/blueman b/apparmor.d/profiles-a-f/blueman
similarity index 100%
rename from apparmor.d/groups/desktop/blueman
rename to apparmor.d/profiles-a-f/blueman
diff --git a/apparmor.d/groups/desktop/blueman-mechanism b/apparmor.d/profiles-a-f/blueman-mechanism
similarity index 100%
rename from apparmor.d/groups/desktop/blueman-mechanism
rename to apparmor.d/profiles-a-f/blueman-mechanism
diff --git a/apparmor.d/groups/desktop/blueman-rfcomm-watcher b/apparmor.d/profiles-a-f/blueman-rfcomm-watcher
similarity index 100%
rename from apparmor.d/groups/desktop/blueman-rfcomm-watcher
rename to apparmor.d/profiles-a-f/blueman-rfcomm-watcher
diff --git a/apparmor.d/groups/desktop/bluemoon b/apparmor.d/profiles-a-f/bluemoon
similarity index 100%
rename from apparmor.d/groups/desktop/bluemoon
rename to apparmor.d/profiles-a-f/bluemoon
diff --git a/apparmor.d/groups/desktop/bluetoothctl b/apparmor.d/profiles-a-f/bluetoothctl
similarity index 100%
rename from apparmor.d/groups/desktop/bluetoothctl
rename to apparmor.d/profiles-a-f/bluetoothctl
diff --git a/apparmor.d/groups/desktop/bluetoothd b/apparmor.d/profiles-a-f/bluetoothd
similarity index 100%
rename from apparmor.d/groups/desktop/bluetoothd
rename to apparmor.d/profiles-a-f/bluetoothd
diff --git a/apparmor.d/groups/desktop/obex-folder-listing b/apparmor.d/profiles-m-r/obex-folder-listing
similarity index 100%
rename from apparmor.d/groups/desktop/obex-folder-listing
rename to apparmor.d/profiles-m-r/obex-folder-listing
diff --git a/apparmor.d/groups/desktop/obexautofs b/apparmor.d/profiles-m-r/obexautofs
similarity index 100%
rename from apparmor.d/groups/desktop/obexautofs
rename to apparmor.d/profiles-m-r/obexautofs
diff --git a/apparmor.d/groups/desktop/obexctl b/apparmor.d/profiles-m-r/obexctl
similarity index 100%
rename from apparmor.d/groups/desktop/obexctl
rename to apparmor.d/profiles-m-r/obexctl
diff --git a/apparmor.d/groups/desktop/obexd b/apparmor.d/profiles-m-r/obexd
similarity index 100%
rename from apparmor.d/groups/desktop/obexd
rename to apparmor.d/profiles-m-r/obexd
diff --git a/apparmor.d/groups/desktop/obexfs b/apparmor.d/profiles-m-r/obexfs
similarity index 100%
rename from apparmor.d/groups/desktop/obexfs
rename to apparmor.d/profiles-m-r/obexfs
diff --git a/apparmor.d/groups/desktop/obexpush-atd b/apparmor.d/profiles-m-r/obexpush-atd
similarity index 100%
rename from apparmor.d/groups/desktop/obexpush-atd
rename to apparmor.d/profiles-m-r/obexpush-atd
diff --git a/apparmor.d/groups/desktop/obexpushd b/apparmor.d/profiles-m-r/obexpushd
similarity index 100%
rename from apparmor.d/groups/desktop/obexpushd
rename to apparmor.d/profiles-m-r/obexpushd