From: James Bunton <jamesbunton@delx.net.au>
Date: Sat, 25 Mar 2017 01:42:24 +0000 (+1100)
Subject: Debian desktop
X-Git-Url: https://code.delx.au/monosys/commitdiff_plain/bafa61efaabb9a4b44cded1e77938c277d7025e4

Debian desktop
---

diff --git a/debian/backup b/debian/backup
index e522816..7d009fa 100644
--- a/debian/backup
+++ b/debian/backup
@@ -1,3 +1,3 @@
 python-pylibacl
 python-pyxattr
-rdiff-backup
\ No newline at end of file
+rdiff-backup
diff --git a/debian/base b/debian/base
index 911fb35..cbe076a 100644
--- a/debian/base
+++ b/debian/base
@@ -2,6 +2,7 @@ acl
 apt-transport-https
 apt-utils
 aptitude
+busybox-static
 ca-certificates
 cryptsetup
 dbus
diff --git a/debian/base-devel b/debian/base-devel
index 9e9dc82..d1d2e2d 100644
--- a/debian/base-devel
+++ b/debian/base-devel
@@ -1,4 +1,4 @@
 build-essential
 fakeroot
 libbsd-dev
-libssl-dev
\ No newline at end of file
+libssl-dev
diff --git a/debian/desktop-apps b/debian/desktop-apps
new file mode 100644
index 0000000..d19061a
--- /dev/null
+++ b/debian/desktop-apps
@@ -0,0 +1,12 @@
+firefox
+google-chrome-stable
+
+libreoffice
+libreoffice-l10n-en-gb
+
+gnome-keyring
+seahorse
+
+xfce4-power-manager
+xfce4-power-manager-plugins
+xscreensaver
diff --git a/debian/desktop-audio b/debian/desktop-audio
new file mode 100644
index 0000000..06bfdca
--- /dev/null
+++ b/debian/desktop-audio
@@ -0,0 +1,6 @@
+alsa-utils
+espeak
+pavucontrol
+pulseaudio
+pulseaudio-module-gconf
+pulseaudio-utils
diff --git a/debian/desktop-base b/debian/desktop-base
new file mode 100644
index 0000000..21ff7f2
--- /dev/null
+++ b/debian/desktop-base
@@ -0,0 +1,4 @@
+accountsservice
+desktop-base
+policykit-1
+policykit-1-gnome
diff --git a/debian/desktop-fonts b/debian/desktop-fonts
new file mode 100644
index 0000000..2950b52
--- /dev/null
+++ b/debian/desktop-fonts
@@ -0,0 +1,4 @@
+ttf-dejavu
+ttf-liberation
+ttf-mscorefonts-installer
+ttf-ubuntu-font-family
diff --git a/debian/desktop-lightdm b/debian/desktop-lightdm
new file mode 100644
index 0000000..5c087b8
--- /dev/null
+++ b/debian/desktop-lightdm
@@ -0,0 +1,2 @@
+lightdm
+lightdm-gtk-greeter
diff --git a/debian/desktop-wallpapers b/debian/desktop-wallpapers
new file mode 100644
index 0000000..efcfa69
--- /dev/null
+++ b/debian/desktop-wallpapers
@@ -0,0 +1,2 @@
+gnome-backgrounds
+mate-backgrounds
diff --git a/debian/desktop-xfce b/debian/desktop-xfce
new file mode 100644
index 0000000..181e42b
--- /dev/null
+++ b/debian/desktop-xfce
@@ -0,0 +1,39 @@
+baobab
+cheese
+d-feet
+eog
+evince
+file-roller
+gcolor2
+gedit
+gnome-font-viewer
+gnome-icon-theme
+gnome-icon-theme-extras
+gnome-icon-theme-symbolic
+gnome-screenshot
+gnome-sound-recorder
+gnome-system-monitor
+gnome-themes-standard
+gtk2-engines-pixbuf
+gtk2-engines-xfce
+gtk3-engines-xfce
+gvfs
+gvfs-backends
+gvfs-bin
+gvfs-fuse
+notify-osd
+thunar
+thunar-volman
+tumbler
+xdotool
+xfce4-appfinder
+xfce4-datetime-plugin
+xfce4-genmon-plugin
+xfce4-panel
+xfce4-pulseaudio-plugin
+xfce4-session
+xfce4-settings
+xfce4-terminal
+xfdesktop4
+xsel
+zenity
diff --git a/debian/desktop-xfwm b/debian/desktop-xfwm
new file mode 100644
index 0000000..7f7614a
--- /dev/null
+++ b/debian/desktop-xfwm
@@ -0,0 +1,2 @@
+xfwm4
+xfwm4-themes
diff --git a/debian/desktop-xmonad b/debian/desktop-xmonad
new file mode 100644
index 0000000..5220d1b
--- /dev/null
+++ b/debian/desktop-xmonad
@@ -0,0 +1,7 @@
+kupfer
+xcompmgr
+
+xmobar
+xmonad
+libghc-xmonad-contrib-dev
+libghc-xmonad-dev
diff --git a/debian/desktop-xorg b/debian/desktop-xorg
new file mode 100644
index 0000000..803b291
--- /dev/null
+++ b/debian/desktop-xorg
@@ -0,0 +1,6 @@
+x11-session-utils
+x11-xserver-utils
+xauth
+xserver-xorg
+xserver-xorg-video-all
+xterm
diff --git a/debian/filesystems b/debian/filesystems
new file mode 100644
index 0000000..26266e5
--- /dev/null
+++ b/debian/filesystems
@@ -0,0 +1,7 @@
+btrfs-tools
+cifs-utils
+dosfstools
+exfat-fuse
+exfat-utils
+ntfs-3g
+xfsprogs
diff --git a/debian/tools-dvd b/debian/tools-dvd
new file mode 100644
index 0000000..0badf37
--- /dev/null
+++ b/debian/tools-dvd
@@ -0,0 +1,4 @@
+dvdbackup
+gddrescue
+libdvdcss2
+regionset
diff --git a/debian/tools-multimedia b/debian/tools-multimedia
new file mode 100644
index 0000000..d6a4568
--- /dev/null
+++ b/debian/tools-multimedia
@@ -0,0 +1,11 @@
+exiv2
+ffmpeg
+gstreamer1.0-libav
+gstreamer1.0-plugins-good
+gstreamer1.0-plugins-ugly
+handbrake-cli
+imagemagick
+mkvtoolnix
+mpv
+sox
+vlc
diff --git a/debian/tools-network b/debian/tools-network
index 94a9038..c4eb4dd 100644
--- a/debian/tools-network
+++ b/debian/tools-network
@@ -3,7 +3,7 @@ dnsutils
 elinks
 fping
 iftop
-iptraf
+iptraf-ng
 iputils-ping
 mtr-tiny
 netcat-openbsd
diff --git a/ubuntu/backup b/ubuntu/backup
new file mode 120000
index 0000000..01aca59
--- /dev/null
+++ b/ubuntu/backup
@@ -0,0 +1 @@
+../debian/backup
\ No newline at end of file
diff --git a/ubuntu/base-devel b/ubuntu/base-devel
new file mode 120000
index 0000000..77a5fcf
--- /dev/null
+++ b/ubuntu/base-devel
@@ -0,0 +1 @@
+../debian/base-devel
\ No newline at end of file
diff --git a/ubuntu/base-ubuntu b/ubuntu/base-ubuntu
new file mode 100644
index 0000000..cdd03d9
--- /dev/null
+++ b/ubuntu/base-ubuntu
@@ -0,0 +1,2 @@
+language-pack-en
+software-properties-common
diff --git a/ubuntu/desktop-apps b/ubuntu/desktop-apps
deleted file mode 100644
index cbf239b..0000000
--- a/ubuntu/desktop-apps
+++ /dev/null
@@ -1,11 +0,0 @@
-firefox
-google-chrome-stable
-
-libreoffice
-libreoffice-l10n-en-gb
-
-gnome-keyring
-seahorse
-
-xfce4-power-manager
-xscreensaver
diff --git a/ubuntu/desktop-apps b/ubuntu/desktop-apps
new file mode 120000
index 0000000..cfa45a8
--- /dev/null
+++ b/ubuntu/desktop-apps
@@ -0,0 +1 @@
+../debian/desktop-apps
\ No newline at end of file
diff --git a/ubuntu/desktop-audio b/ubuntu/desktop-audio
deleted file mode 100644
index 40640d6..0000000
--- a/ubuntu/desktop-audio
+++ /dev/null
@@ -1,8 +0,0 @@
-alsa-base
-alsa-utils
-espeak
-pavucontrol
-pulseaudio
-pulseaudio-module-gconf
-pulseaudio-module-x11
-pulseaudio-utils
diff --git a/ubuntu/desktop-audio b/ubuntu/desktop-audio
new file mode 120000
index 0000000..7a09a78
--- /dev/null
+++ b/ubuntu/desktop-audio
@@ -0,0 +1 @@
+../debian/desktop-audio
\ No newline at end of file
diff --git a/ubuntu/desktop-audio-ubuntu b/ubuntu/desktop-audio-ubuntu
new file mode 100644
index 0000000..af4089c
--- /dev/null
+++ b/ubuntu/desktop-audio-ubuntu
@@ -0,0 +1,2 @@
+alsa-base
+pulseaudio-module-x11
diff --git a/ubuntu/desktop-base b/ubuntu/desktop-base
deleted file mode 100644
index c42822a..0000000
--- a/ubuntu/desktop-base
+++ /dev/null
@@ -1,8 +0,0 @@
-accountsservice
-console-setup
-desktop-base
-language-pack-en
-language-pack-gnome-en
-policykit-1
-policykit-1-gnome
-software-properties-common
diff --git a/ubuntu/desktop-base b/ubuntu/desktop-base
new file mode 120000
index 0000000..0411b5c
--- /dev/null
+++ b/ubuntu/desktop-base
@@ -0,0 +1 @@
+../debian/desktop-base
\ No newline at end of file
diff --git a/ubuntu/desktop-base-ubuntu b/ubuntu/desktop-base-ubuntu
new file mode 100644
index 0000000..2b54d6b
--- /dev/null
+++ b/ubuntu/desktop-base-ubuntu
@@ -0,0 +1 @@
+language-pack-gnome-en
diff --git a/ubuntu/desktop-fonts b/ubuntu/desktop-fonts
deleted file mode 100644
index 2950b52..0000000
--- a/ubuntu/desktop-fonts
+++ /dev/null
@@ -1,4 +0,0 @@
-ttf-dejavu
-ttf-liberation
-ttf-mscorefonts-installer
-ttf-ubuntu-font-family
diff --git a/ubuntu/desktop-fonts b/ubuntu/desktop-fonts
new file mode 120000
index 0000000..7392a49
--- /dev/null
+++ b/ubuntu/desktop-fonts
@@ -0,0 +1 @@
+../debian/desktop-fonts
\ No newline at end of file
diff --git a/ubuntu/desktop-lightdm b/ubuntu/desktop-lightdm
deleted file mode 100644
index 5c087b8..0000000
--- a/ubuntu/desktop-lightdm
+++ /dev/null
@@ -1,2 +0,0 @@
-lightdm
-lightdm-gtk-greeter
diff --git a/ubuntu/desktop-lightdm b/ubuntu/desktop-lightdm
new file mode 120000
index 0000000..7628791
--- /dev/null
+++ b/ubuntu/desktop-lightdm
@@ -0,0 +1 @@
+../debian/desktop-lightdm
\ No newline at end of file
diff --git a/ubuntu/desktop-wallpapers b/ubuntu/desktop-wallpapers
index b46b5c2..12de055 100644
--- a/ubuntu/desktop-wallpapers
+++ b/ubuntu/desktop-wallpapers
@@ -1,3 +1,4 @@
+gnome-backgrounds
 ubuntu-wallpapers-karmic
 ubuntu-wallpapers-lucid
 ubuntu-wallpapers-maverick
diff --git a/ubuntu/desktop-xfce b/ubuntu/desktop-xfce
deleted file mode 100644
index 163d93d..0000000
--- a/ubuntu/desktop-xfce
+++ /dev/null
@@ -1,40 +0,0 @@
-baobab
-cheese
-d-feet
-eog
-evince
-file-roller
-gcolor2
-gedit
-gnome-backgrounds
-gnome-font-viewer
-gnome-icon-theme
-gnome-icon-theme-extras
-gnome-icon-theme-symbolic
-gnome-screenshot
-gnome-sound-recorder
-gnome-system-monitor
-gnome-themes-standard
-gtk2-engines-pixbuf
-gtk2-engines-xfce
-gtk3-engines-xfce
-gvfs
-gvfs-backends
-gvfs-bin
-gvfs-fuse
-notify-osd
-thunar
-thunar-volman
-tumbler
-xdotool
-xfce4-appfinder
-xfce4-datetime-plugin
-xfce4-genmon-plugin
-xfce4-panel
-xfce4-pulseaudio-plugin
-xfce4-session
-xfce4-settings
-xfce4-terminal
-xfdesktop4
-xsel
-zenity
diff --git a/ubuntu/desktop-xfce b/ubuntu/desktop-xfce
new file mode 120000
index 0000000..3444013
--- /dev/null
+++ b/ubuntu/desktop-xfce
@@ -0,0 +1 @@
+../debian/desktop-xfce
\ No newline at end of file
diff --git a/ubuntu/desktop-xfwm b/ubuntu/desktop-xfwm
deleted file mode 100644
index 7f7614a..0000000
--- a/ubuntu/desktop-xfwm
+++ /dev/null
@@ -1,2 +0,0 @@
-xfwm4
-xfwm4-themes
diff --git a/ubuntu/desktop-xfwm b/ubuntu/desktop-xfwm
new file mode 120000
index 0000000..b71843a
--- /dev/null
+++ b/ubuntu/desktop-xfwm
@@ -0,0 +1 @@
+../debian/desktop-xfwm
\ No newline at end of file
diff --git a/ubuntu/desktop-xmonad b/ubuntu/desktop-xmonad
new file mode 120000
index 0000000..346a2dc
--- /dev/null
+++ b/ubuntu/desktop-xmonad
@@ -0,0 +1 @@
+../debian/desktop-xmonad
\ No newline at end of file
diff --git a/ubuntu/desktop-xorg b/ubuntu/desktop-xorg
deleted file mode 100644
index 803b291..0000000
--- a/ubuntu/desktop-xorg
+++ /dev/null
@@ -1,6 +0,0 @@
-x11-session-utils
-x11-xserver-utils
-xauth
-xserver-xorg
-xserver-xorg-video-all
-xterm
diff --git a/ubuntu/desktop-xorg b/ubuntu/desktop-xorg
new file mode 120000
index 0000000..c0c75a5
--- /dev/null
+++ b/ubuntu/desktop-xorg
@@ -0,0 +1 @@
+../debian/desktop-xorg
\ No newline at end of file
diff --git a/ubuntu/filesystems b/ubuntu/filesystems
deleted file mode 100644
index 26266e5..0000000
--- a/ubuntu/filesystems
+++ /dev/null
@@ -1,7 +0,0 @@
-btrfs-tools
-cifs-utils
-dosfstools
-exfat-fuse
-exfat-utils
-ntfs-3g
-xfsprogs
diff --git a/ubuntu/filesystems b/ubuntu/filesystems
new file mode 120000
index 0000000..307d0fa
--- /dev/null
+++ b/ubuntu/filesystems
@@ -0,0 +1 @@
+../debian/filesystems
\ No newline at end of file
diff --git a/ubuntu/tools-dvd b/ubuntu/tools-dvd
deleted file mode 100644
index 0badf37..0000000
--- a/ubuntu/tools-dvd
+++ /dev/null
@@ -1,4 +0,0 @@
-dvdbackup
-gddrescue
-libdvdcss2
-regionset
diff --git a/ubuntu/tools-dvd b/ubuntu/tools-dvd
new file mode 120000
index 0000000..d686f3b
--- /dev/null
+++ b/ubuntu/tools-dvd
@@ -0,0 +1 @@
+../debian/tools-dvd
\ No newline at end of file
diff --git a/ubuntu/tools-multimedia b/ubuntu/tools-multimedia
deleted file mode 100644
index d6a4568..0000000
--- a/ubuntu/tools-multimedia
+++ /dev/null
@@ -1,11 +0,0 @@
-exiv2
-ffmpeg
-gstreamer1.0-libav
-gstreamer1.0-plugins-good
-gstreamer1.0-plugins-ugly
-handbrake-cli
-imagemagick
-mkvtoolnix
-mpv
-sox
-vlc
diff --git a/ubuntu/tools-multimedia b/ubuntu/tools-multimedia
new file mode 120000
index 0000000..8267095
--- /dev/null
+++ b/ubuntu/tools-multimedia
@@ -0,0 +1 @@
+../debian/tools-multimedia
\ No newline at end of file