From bfcf2c3545411104b8c6303f32312570e9b7c72c Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 2 May 2014 13:14:34 +0200
Subject: [stage4] added gnome-fallback session to stage4 whitelist

---
 server/blacklists/desktop-sessions/filter | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'server')

diff --git a/server/blacklists/desktop-sessions/filter b/server/blacklists/desktop-sessions/filter
index aafd1156..9281a412 100644
--- a/server/blacklists/desktop-sessions/filter
+++ b/server/blacklists/desktop-sessions/filter
@@ -1,5 +1,11 @@
 - /usr/share/xsessions/*
-+ /usr/share/xsessions/gnome.desktop
-+ /usr/share/xsessions/kde-plasma.desktop
 + /usr/share/xsessions/ubuntu.desktop
 + /usr/share/xsessions/xfce.desktop
+
+# TODO: until gnome-shell conflicts with unity gets fixed
+#			for ubuntu 14.04, filter it.
+# + /usr/share/xsessions/gnome.desktop
+
+# gnome-session-fallback for the good ol' gnome2 session
++ /usr/share/xsessions/gnome-fallback.desktop
++ /usr/share/xsessions/kde-plasma.desktop
-- 
cgit v1.2.3-55-g7522


From 7f7394b5b3f73c228a302e929de9934f0b980653 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 2 May 2014 14:12:31 +0200
Subject: [unity] remove ubuntu software center and amazon webapps from menu

---
 server/blacklists/desktop-sessions/unity/unity-apps | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 server/blacklists/desktop-sessions/unity/unity-apps

(limited to 'server')

diff --git a/server/blacklists/desktop-sessions/unity/unity-apps b/server/blacklists/desktop-sessions/unity/unity-apps
new file mode 100644
index 00000000..1f68f3c9
--- /dev/null
+++ b/server/blacklists/desktop-sessions/unity/unity-apps
@@ -0,0 +1,2 @@
+- /usr/share/applications/ubuntu-software-center.desktop
+- /usr/share/applications/ubuntu-amazon-default.desktop
-- 
cgit v1.2.3-55-g7522