From 71bbd100bfd156b0d8873626bd0c444b35bd3032 Mon Sep 17 00:00:00 2001
From: James Bunton <jamesbunton@delx.net.au>
Date: Tue, 11 Jun 2019 14:04:50 +1000
Subject: [PATCH] Combine more desktop package lists

---
 arch/desktop-gnome     | 6 ++++++
 arch/desktop-gnome-ext | 4 ----
 arch/desktop-lightdm   | 2 --
 arch/desktop-xfce      | 2 ++
 debian/desktop-base    | 4 ----
 debian/desktop-lightdm | 2 --
 debian/desktop-xfce    | 6 ++++++
 ubuntu/desktop-apps    | 1 -
 ubuntu/desktop-base    | 1 -
 ubuntu/desktop-lightdm | 1 -
 ubuntu/desktop-xfwm    | 1 -
 ubuntu/desktop-xmonad  | 1 -
 12 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 arch/desktop-gnome-ext
 delete mode 100644 arch/desktop-lightdm
 delete mode 100644 debian/desktop-base
 delete mode 100644 debian/desktop-lightdm
 delete mode 120000 ubuntu/desktop-apps
 delete mode 120000 ubuntu/desktop-base
 delete mode 120000 ubuntu/desktop-lightdm
 delete mode 120000 ubuntu/desktop-xfwm
 delete mode 120000 ubuntu/desktop-xmonad

diff --git a/arch/desktop-gnome b/arch/desktop-gnome
index 72a5a28..b8b04d1 100644
--- a/arch/desktop-gnome
+++ b/arch/desktop-gnome
@@ -31,3 +31,9 @@ seahorse
 sushi
 tracker
 tracker-miners
+
+# Extensions
+gnome-shell-extension-appindicator
+gnome-shell-extension-no-topleft-hot-corner
+gnome-shell-extension-sometimes-steal-my-focus
+libappindicator-gtk3
diff --git a/arch/desktop-gnome-ext b/arch/desktop-gnome-ext
deleted file mode 100644
index c1232d8..0000000
--- a/arch/desktop-gnome-ext
+++ /dev/null
@@ -1,4 +0,0 @@
-gnome-shell-extension-appindicator
-gnome-shell-extension-no-topleft-hot-corner
-gnome-shell-extension-sometimes-steal-my-focus
-libappindicator-gtk3
diff --git a/arch/desktop-lightdm b/arch/desktop-lightdm
deleted file mode 100644
index 5c087b8..0000000
--- a/arch/desktop-lightdm
+++ /dev/null
@@ -1,2 +0,0 @@
-lightdm
-lightdm-gtk-greeter
diff --git a/arch/desktop-xfce b/arch/desktop-xfce
index e44d751..e560b47 100644
--- a/arch/desktop-xfce
+++ b/arch/desktop-xfce
@@ -7,6 +7,8 @@ gtk-xfce-engine
 gvfs
 gvfs-mtp
 gvfs-smb
+lightdm
+lightdm-gtk-greeter
 thunar
 thunar-volman
 tumbler
diff --git a/debian/desktop-base b/debian/desktop-base
deleted file mode 100644
index 21ff7f2..0000000
--- a/debian/desktop-base
+++ /dev/null
@@ -1,4 +0,0 @@
-accountsservice
-desktop-base
-policykit-1
-policykit-1-gnome
diff --git a/debian/desktop-lightdm b/debian/desktop-lightdm
deleted file mode 100644
index 5c087b8..0000000
--- a/debian/desktop-lightdm
+++ /dev/null
@@ -1,2 +0,0 @@
-lightdm
-lightdm-gtk-greeter
diff --git a/debian/desktop-xfce b/debian/desktop-xfce
index c1fb200..9e2d4f0 100644
--- a/debian/desktop-xfce
+++ b/debian/desktop-xfce
@@ -1,3 +1,5 @@
+accountsservice
+desktop-base
 eog
 evince
 file-roller
@@ -14,6 +16,10 @@ gvfs
 gvfs-backends
 gvfs-bin
 gvfs-fuse
+lightdm
+lightdm-gtk-greeter
+policykit-1
+policykit-1-gnome
 thunar
 thunar-volman
 tumbler
diff --git a/ubuntu/desktop-apps b/ubuntu/desktop-apps
deleted file mode 120000
index cfa45a8..0000000
--- a/ubuntu/desktop-apps
+++ /dev/null
@@ -1 +0,0 @@
-../debian/desktop-apps
\ No newline at end of file
diff --git a/ubuntu/desktop-base b/ubuntu/desktop-base
deleted file mode 120000
index 0411b5c..0000000
--- a/ubuntu/desktop-base
+++ /dev/null
@@ -1 +0,0 @@
-../debian/desktop-base
\ No newline at end of file
diff --git a/ubuntu/desktop-lightdm b/ubuntu/desktop-lightdm
deleted file mode 120000
index 7628791..0000000
--- a/ubuntu/desktop-lightdm
+++ /dev/null
@@ -1 +0,0 @@
-../debian/desktop-lightdm
\ No newline at end of file
diff --git a/ubuntu/desktop-xfwm b/ubuntu/desktop-xfwm
deleted file mode 120000
index b71843a..0000000
--- a/ubuntu/desktop-xfwm
+++ /dev/null
@@ -1 +0,0 @@
-../debian/desktop-xfwm
\ No newline at end of file
diff --git a/ubuntu/desktop-xmonad b/ubuntu/desktop-xmonad
deleted file mode 120000
index 346a2dc..0000000
--- a/ubuntu/desktop-xmonad
+++ /dev/null
@@ -1 +0,0 @@
-../debian/desktop-xmonad
\ No newline at end of file
-- 
2.39.2