From 18f56603b3c2b2c1f5fb04978da9f0f9a95424ea Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 4 Apr 2021 21:38:07 +0100
Subject: [PATCH] Remove flavor configuration.

---
 PKGBUILD     |  2 +-
 configure    | 17 +----------------
 debian/rules |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index c39a777d..13cf7fcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ prepare() {
   git clone "$startdir" "$srcdir/$pkgname"
   cd "$srcdir/$pkgname"
 
-  ./configure --distribution=archlinux --flavor=desktop
+  ./configure --distribution=archlinux
 }
 
 package() {
diff --git a/configure b/configure
index e766a5f2..a520507e 100755
--- a/configure
+++ b/configure
@@ -45,19 +45,6 @@ configure() {
 
 	fi
 
-	echo "Set the configuration for a $FLAVOR."
-	if [[ "$FLAVOR" == server ]]; then
-		REMOVE_LIST+=(
-			apparmor.d/groups/apps
-			apparmor.d/groups/browsers
-			apparmor.d/groups/desktop
-			apparmor.d/groups/gnome
-			apparmor.d/groups/gvfs
-			apparmor.d/groups/network/NetworkManager
-			apparmor.d/groups/network/nm-*
-		)
-
-	fi
 }
 
 # Initialise the apparmor.d with the selected configuration.
@@ -110,19 +97,17 @@ cmd_help() {
 
 	Options:
 	    --distribution=DIST Set the target Linux distribution (Archlinux, Debian)
-	    --flavor=FLAVOR     Special flavor specific configuration (desktop, server)
 	    --help              Print this help message and exit.
 	_EOF
 }
 
 main() {
 	local opts err
-	opts="$(getopt -o h -l distribution:,flavor:,groups:,help -n "$PROGRAM" -- "$@")"
+	opts="$(getopt -o h -l distribution:,help -n "$PROGRAM" -- "$@")"
 	err=$?
 	eval set -- "$opts"
 	while true; do case $1 in
 		--distribution) DISTRIBUTION="$2"; shift 2 ;;
-		--flavor) FLAVOR="$2"; shift 2 ;;
 		-h|--help) shift; cmd_help; exit 0 ;;
 		--) shift; break ;;
 	esac done
diff --git a/debian/rules b/debian/rules
index 842e968d..335d5b09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 	dh $@ --with=config-package
 
 override_dh_auto_configure:
-	./configure --distribution=debian --flavor=desktop
+	./configure --distribution=debian
 
 override_dh_install:
 	find systemd/ -type f -exec \