From aab6492b90a2fb10c6ab1e86b310146780a15905 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Fri, 11 Nov 2005 20:04:13 +0000
Subject: [PATCH] 	* tuned XFCE.basic and added XFCE.fair

---
 .../Desktop Enviroment/30-XFCE.basic.choice   | 27 ++++++++++++-------
 .../Desktop Enviroment/40-XFCE.fair.choice    | 26 ++++++++++++++++++
 2 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 pkgsel/Desktop/Desktop Enviroment/40-XFCE.fair.choice

diff --git a/pkgsel/Desktop/Desktop Enviroment/30-XFCE.basic.choice b/pkgsel/Desktop/Desktop Enviroment/30-XFCE.basic.choice
index 4a5c786..4939dc6 100644
--- a/pkgsel/Desktop/Desktop Enviroment/30-XFCE.basic.choice	
+++ b/pkgsel/Desktop/Desktop Enviroment/30-XFCE.basic.choice	
@@ -1,18 +1,25 @@
+#Description: Basic Xfce Desktop
 #Dependencies: GTK
-#Forced: PYTHON
+#Imply: minimal
 
-X xfce4/*
+X xfdesktop
+X xffm
+X xfwm4
 
-# needed by xfce4-print
-X a2ps
+X xfce4-session
+X xfce4-panel
+X xfce4-appfinder
+X xfce4-iconbox
+X xfce-mcs-manager
 
-# needed by xfce4-terminal
-X dbus
-X vte
+X xfce-utils
 
-# needed by xscreensaver
-X libglade
-X xscreensaver
+X xfce4-trigger-launcher
+X xfce4-icon-theme
+X xfwm4-themes
+X xfce-mcs-plugins
+
+X xfce4-systray
 
 # needed to shutdown and reboot
 X sudo
diff --git a/pkgsel/Desktop/Desktop Enviroment/40-XFCE.fair.choice b/pkgsel/Desktop/Desktop Enviroment/40-XFCE.fair.choice
new file mode 100644
index 0000000..99f4b2e
--- /dev/null
+++ b/pkgsel/Desktop/Desktop Enviroment/40-XFCE.fair.choice	
@@ -0,0 +1,26 @@
+#Description: Quite Complete Xfce Desktop
+#Dependencies: GTK
+#Imply: minimal basic
+#Forced: PYTHON
+
+X xfcalendar
+
+X xfce4-battery-plugin
+X xfce4-systemload-plugin
+X xfce4-panelmenu
+
+# lil' star is nice, but we prefer taskbar plugin
+O xfce4-iconbox
+X xfce4-taskbar-plugin
+
+# xffm sucks
+O xffm
+X thunar
+
+X xfce-terminal
+# needed by xfce4-terminal
+# X python
+X dbus
+X vte
+# needed by xfce4-terminal and thunar
+X libexo