From e9aa50f8f61fe26569f4aa331583d8a071897fee Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Tue, 19 Feb 2019 09:47:05 -0500
Subject: package lists tweaks

---
 configs/profile/packages/packages-all.all                      | 4 ++--
 configs/profile/packages/packages-all.i686                     | 2 ++
 configs/profile/packages/packages-gui.all                      | 4 ----
 configs/profile/packages/packages-systemd-gui.all              | 4 ++++
 configs/profile/root-image/root/.install-openrc-lxde/packages  | 5 +----
 configs/profile/root-image/root/.install-systemd-mate/packages | 5 +----
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/configs/profile/packages/packages-all.all b/configs/profile/packages/packages-all.all
index bd9fe3e..c081614 100644
--- a/configs/profile/packages/packages-all.all
+++ b/configs/profile/packages/packages-all.all
@@ -37,14 +37,14 @@ p7zip
 partclone
 parted
 partimage
-pptpclient
 ppp
+pptpclient
 rp-pppoe
 smartmontools
 sudo
 tcpdump
 testdisk
-unar
+unarchiver
 unzip
 usb_modeswitch
 vpnc
diff --git a/configs/profile/packages/packages-all.i686 b/configs/profile/packages/packages-all.i686
index 56e6105..79226c2 100644
--- a/configs/profile/packages/packages-all.i686
+++ b/configs/profile/packages/packages-all.i686
@@ -1,3 +1,5 @@
 # this file specifies the packages that are to be installed
 # in all i686 live environments regardless of the init system or graphical environment
 # but these packages will not be installed for other architectures
+
+pcmciautils
diff --git a/configs/profile/packages/packages-gui.all b/configs/profile/packages/packages-gui.all
index b85b68b..a4f3d6c 100644
--- a/configs/profile/packages/packages-gui.all
+++ b/configs/profile/packages/packages-gui.all
@@ -33,16 +33,12 @@ network-manager-applet
 
 # GUI Programs
 abiword
-calamares
 gnumeric
 gparted
 icedove
 iceweasel
 leafpad
 octopi
-octopi-cachecleaner
-octopi-notifier
-octopi-repoeditor
 pidgin
 qtox
 ring
diff --git a/configs/profile/packages/packages-systemd-gui.all b/configs/profile/packages/packages-systemd-gui.all
index 22cf8d4..c215664 100644
--- a/configs/profile/packages/packages-systemd-gui.all
+++ b/configs/profile/packages/packages-systemd-gui.all
@@ -3,5 +3,9 @@
 # but these packages will not be installed in CLI environments or with other init systems
 
 
+# GUI Programs
+calamares
+
+
 # Services
 networkmanager
diff --git a/configs/profile/root-image/root/.install-openrc-lxde/packages b/configs/profile/root-image/root/.install-openrc-lxde/packages
index a18c44d..6838e54 100644
--- a/configs/profile/root-image/root/.install-openrc-lxde/packages
+++ b/configs/profile/root-image/root/.install-openrc-lxde/packages
@@ -11,7 +11,7 @@ wpa_supplicant-openrc
 bash-completion
 p7zip
 sudo
-unar
+unarchiver
 unzip
 zip
 abiword
@@ -20,9 +20,6 @@ icedove
 iceweasel
 leafpad
 octopi
-octopi-cachecleaner
-octopi-notifier
-octopi-repoeditor
 pidgin
 qtox
 ring
diff --git a/configs/profile/root-image/root/.install-systemd-mate/packages b/configs/profile/root-image/root/.install-systemd-mate/packages
index 299605e..4262345 100644
--- a/configs/profile/root-image/root/.install-systemd-mate/packages
+++ b/configs/profile/root-image/root/.install-systemd-mate/packages
@@ -11,7 +11,7 @@ wpa_supplicant
 bash-completion
 p7zip
 sudo
-unar
+unarchiver
 unzip
 zip
 abiword
@@ -20,9 +20,6 @@ icedove
 iceweasel
 leafpad
 octopi
-octopi-cachecleaner
-octopi-notifier
-octopi-repoeditor
 pidgin
 qtox
 ring
-- 
cgit v1.2.2