From 9c86369b4ee1ec1fca30f296236468e2f5b1b29f Mon Sep 17 00:00:00 2001
From: James Bunton <jamesbunton@theseus.bnet.delx.net.au>
Date: Sun, 3 Apr 2022 23:39:16 +1000
Subject: [PATCH] Reorganise

---
 debian/base                | 52 ++++++++++++++++++++++++++++++++------
 debian/base-hw             | 14 ++++++++++
 debian/base-network        | 15 -----------
 debian/base-tools          | 27 --------------------
 debian/desktop-audio       |  5 ----
 debian/desktop-base        | 18 +++++++++++++
 debian/desktop-fonts       |  4 ---
 debian/desktop-wallpapers  |  2 --
 debian/filesystems         |  1 +
 ubuntu/desktop-base-ubuntu | 17 +++++++++++++
 ubuntu/desktop-wallpapers  | 15 -----------
 11 files changed, 94 insertions(+), 76 deletions(-)
 create mode 100644 debian/base-hw
 delete mode 100644 debian/base-network
 delete mode 100644 debian/base-tools
 delete mode 100644 debian/desktop-audio
 delete mode 100644 debian/desktop-fonts
 delete mode 100644 debian/desktop-wallpapers
 delete mode 100644 ubuntu/desktop-wallpapers

diff --git a/debian/base b/debian/base
index 1ab49e4..82433dd 100644
--- a/debian/base
+++ b/debian/base
@@ -1,48 +1,84 @@
+# My base
 acl
 apt-config-auto-update
 apt-utils
 aptitude
+bash-completion
 busybox-static
-bzip2
 ca-certificates
 dbus
 dbus-user-session
 debian-keyring
 debian-security-support
+diffutils
 doc-debian
-e2fsprogs
 eject
+fdupes
 file
 gawk
+git
+hexedit
 info
 initramfs-tools
-iproute2
+jq
 less
 libpam-systemd
-lm-sensors
 locales
 logrotate
+lsof
 man-db
 manpages
 mlocate
+moreutils
 nano
 netbase
 openssh-client
 openssh-server
 patch
-pciutils
 popularity-contest
 psmisc
+pv
 python3
+renameutils
 reportbug
+ripgrep
 rsync
+screen
 sed
+sqlite3
+strace
 sudo
-tar
+systemd-container
 time
 tzdata
-unzip
-usbutils
+uuid-runtime
 vim
+virtualenv
 whiptail
+
+# Compression
+bzip2
+cpio
+gzip
+p7zip
+tar
+unzip
+xz-utils
 zip
+
+# Network
+bind9-dnsutils
+curl
+fping
+iptables
+iftop
+iperf3
+iputils-ping
+mtr-tiny
+netcat-openbsd
+nmap
+tcpdump
+telnet
+wget
+whois
+iproute2
diff --git a/debian/base-hw b/debian/base-hw
new file mode 100644
index 0000000..eac931b
--- /dev/null
+++ b/debian/base-hw
@@ -0,0 +1,14 @@
+atop
+dmidecode
+ethtool
+fwupd
+gddrescue
+gdisk
+hdparm
+iotop
+lm-sensors
+lshw
+pciutils
+smartmontools
+sysstat
+usbutils
diff --git a/debian/base-network b/debian/base-network
deleted file mode 100644
index 84cbfff..0000000
--- a/debian/base-network
+++ /dev/null
@@ -1,15 +0,0 @@
-bind9-dnsutils
-curl
-ethtool
-fping
-iptables
-iftop
-iperf3
-iputils-ping
-mtr-tiny
-netcat-openbsd
-nmap
-tcpdump
-telnet
-wget
-whois
diff --git a/debian/base-tools b/debian/base-tools
deleted file mode 100644
index 2268e3d..0000000
--- a/debian/base-tools
+++ /dev/null
@@ -1,27 +0,0 @@
-atop
-bash-completion
-diffutils
-dmidecode
-fdupes
-gddrescue
-gdisk
-git
-jq
-hdparm
-hexedit
-iotop
-lshw
-lsof
-moreutils
-pv
-renameutils
-ripgrep
-screen
-smartmontools
-sqlite3
-strace
-sysstat
-systemd-container
-uuid-runtime
-virtualenv
-xz-utils
diff --git a/debian/desktop-audio b/debian/desktop-audio
deleted file mode 100644
index 176ea91..0000000
--- a/debian/desktop-audio
+++ /dev/null
@@ -1,5 +0,0 @@
-alsa-utils
-paprefs
-pavucontrol
-pulseaudio
-pulseaudio-utils
diff --git a/debian/desktop-base b/debian/desktop-base
index b182e32..28e920c 100644
--- a/debian/desktop-base
+++ b/debian/desktop-base
@@ -1,3 +1,21 @@
+# Desktop base
 d-feet
 dconf-editor
 zenity
+
+# Audio
+alsa-utils
+paprefs
+pavucontrol
+pulseaudio
+pulseaudio-utils
+
+# Fonts
+fonts-dejavu
+fonts-liberation
+fonts-ubuntu
+ttf-mscorefonts-installer
+
+# Wallpapers
+gnome-backgrounds
+mate-backgrounds
diff --git a/debian/desktop-fonts b/debian/desktop-fonts
deleted file mode 100644
index 70ac809..0000000
--- a/debian/desktop-fonts
+++ /dev/null
@@ -1,4 +0,0 @@
-fonts-dejavu
-fonts-liberation
-fonts-ubuntu
-ttf-mscorefonts-installer
diff --git a/debian/desktop-wallpapers b/debian/desktop-wallpapers
deleted file mode 100644
index efcfa69..0000000
--- a/debian/desktop-wallpapers
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-backgrounds
-mate-backgrounds
diff --git a/debian/filesystems b/debian/filesystems
index f9469d9..fcf5989 100644
--- a/debian/filesystems
+++ b/debian/filesystems
@@ -1,5 +1,6 @@
 btrfs-progs
 dosfstools
+e2fsprogs
 exfat-utils
 ntfs-3g
 xfsprogs
diff --git a/ubuntu/desktop-base-ubuntu b/ubuntu/desktop-base-ubuntu
index 2b54d6b..c77b4ce 100644
--- a/ubuntu/desktop-base-ubuntu
+++ b/ubuntu/desktop-base-ubuntu
@@ -1 +1,18 @@
+# Ubuntu desktop base
 language-pack-gnome-en
+
+# Ubuntu wallpapers
+ubuntu-wallpapers-karmic
+ubuntu-wallpapers-lucid
+ubuntu-wallpapers-maverick
+ubuntu-wallpapers-natty
+ubuntu-wallpapers-oneiric
+ubuntu-wallpapers-precise
+ubuntu-wallpapers-quantal
+ubuntu-wallpapers-raring
+ubuntu-wallpapers-saucy
+ubuntu-wallpapers-trusty
+ubuntu-wallpapers-utopic
+ubuntu-wallpapers-vivid
+ubuntu-wallpapers-wily
+ubuntu-wallpapers-xenial
diff --git a/ubuntu/desktop-wallpapers b/ubuntu/desktop-wallpapers
deleted file mode 100644
index 12de055..0000000
--- a/ubuntu/desktop-wallpapers
+++ /dev/null
@@ -1,15 +0,0 @@
-gnome-backgrounds
-ubuntu-wallpapers-karmic
-ubuntu-wallpapers-lucid
-ubuntu-wallpapers-maverick
-ubuntu-wallpapers-natty
-ubuntu-wallpapers-oneiric
-ubuntu-wallpapers-precise
-ubuntu-wallpapers-quantal
-ubuntu-wallpapers-raring
-ubuntu-wallpapers-saucy
-ubuntu-wallpapers-trusty
-ubuntu-wallpapers-utopic
-ubuntu-wallpapers-vivid
-ubuntu-wallpapers-wily
-ubuntu-wallpapers-xenial
-- 
2.39.2