separate software lists

diff --git a/debian-trixie-desktop.mk b/debian-trixie-desktop.mk
index d7df484ff2f9a1b25e2c9b3ab093ea00bdc59afc..638879516752516cf5a2cc4235749f2b18de717a 100644 (file)
--- a/debian-trixie-desktop.mk
+++ b/debian-trixie-desktop.mk
@@ -14,53 +14,7 @@ endef
 modules=xfce,gimp #,approx
 
 ## Packages
-packages = 
-packages += alsa-utils audacity
-packages += blender brasero brasero-cdrkit
-packages += chromium chromium-sandbox cifs-utils claws-mail claws-mail-pgpinline claws-mail-pgpmime claws-mail-vcalendar-plugin clementine cryptsetup cups cups-browsed
-packages += dosfstools dvdauthor dvd+rw-tools
-packages += eject exfat-fuse exfatprogs
-packages += firefox-esr firefox-esr-l10n-de fonts-liberation fonts-liberation2 frei0r-plugins
-packages += gdebi git gnumeric gparted gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-x gwenview
-packages += hplip hplip-gui hunspell hunspell-de-de hyphen-de
-packages += inkscape inkscape-tutorials
-packages += k3b k3b-i18n kate kbd kcalc kdenlive kde-spectacle kde-style-breeze krita krita-l10n
-packages += libnss3-tools libblockdev-crypto3 libk3b-extracodecs libpam-mount libpam-script libreoffice libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze live-boot live-boot-initramfs-tools locales lvm2 lightdm
-packages += man-db marble mdadm mesa-utils mousepad mumble
-packages += nbd-client netcat-openbsd network-manager-gnome nscd ntfs-3g ntpdate
-packages += obs-studio okular os-prober
-packages += p7zip-full pavucontrol pdfchain plymouth plymouth-themes
-packages += recordmydesktop
-packages += samba-common-bin squashfs-tools synaptic syslinux syslinux-common syslinux-efi
-packages += thunar-volman thunderbird thunderbird-l10n-de tmux
-packages += unace unrar-free usermode
-packages += va-driver-all vdpau-driver-all vlc
-packages += x264 xdotool xfce4-goodies xfce4-power-manager-plugins xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-wacom xserver-xorg-video-all
-packages += yt-dlp
-
-# Hardware Spcific
-packages += linux-image-amd64 grub-pc xserver-xorg-video-intel
-
-# Games - Common
-# packages += extremetuxracer
-# packages += fillets-ng freeciv freeciv-client-sdl
-# packages += gnome-2048 gunroar
-# packages += hedgewars hex-a-hop
-# packages += kpat
-# packages += supertux supertuxkart
-# packages += torus-trooper
-# packages += wesnoth-1.18 wesnoth-1.18-httt wesnoth-music
-
-# Games - Minetest
-# packages += minetest minetest-server
-# packages += minetest-mod-3d-armor
-# packages += minetest-mod-craftguide minetest-mod-ethereal
-# packages += minetest-mod-mesecons minetest-mod-mobs-redo
-# packages += minetest-mod-pipeworks minetest-mod-protector
-# packages += minetest-mod-unified-inventory
-
-# Games - Teenage / Adult
-# packages += 0ad flare-game openarena warzone2100
+packages = $(shell grep -v ^# debian-trixie-desktop.sw)
 
 ## Hostname for the generated machine
 hostname=${mainuser}-debian

diff --git a/debian-trixie-desktop.sw b/debian-trixie-desktop.sw
new file mode 100644 (file)
index 0000000..699bd2b
--- /dev/null
+++ b/debian-trixie-desktop.sw
@@ -0,0 +1,145 @@
+acpi
+alsa-utils
+audacity
+blender
+brasero
+brasero-cdrkit
+chromium
+chromium-l10n
+chromium-sandbox
+cifs-utils
+claws-mail
+claws-mail-pgpinline
+claws-mail-pgpmime
+claws-mail-vcalendar-plugin
+clementine
+cryptsetup
+cups
+cups-browsed
+dosfstools
+dvdauthor
+dvd+rw-tools
+eject
+exfat-fuse
+exfatprogs
+firefox-esr
+firefox-esr-l10n-de
+fonts-liberation
+fonts-liberation2
+frei0r-plugins
+gdebi
+git
+gnumeric
+gparted
+growisofs
+gstreamer1.0-plugins-good
+gstreamer1.0-plugins-ugly
+gstreamer1.0-x
+gwenview
+hplip
+hplip-gui
+hunspell
+hunspell-de-de
+hyphen-de
+inkscape
+inkscape-tutorials
+k3b
+k3b-i18n
+kate
+kbd
+kcalc
+kdenlive
+kde-style-breeze
+krita
+krita-l10n
+libblockdev-crypto3
+libk3b-extracodecs
+libnss3-tools
+libpam-mount
+libpam-script
+libreoffice
+libreoffice-gnome
+libreoffice-gtk3
+libreoffice-l10n-de
+libreoffice-style-breeze
+lightdm
+linux-image-amd64
+locales
+lshw
+lvm2
+man-db
+manpages-de
+marble
+mdadm
+mesa-utils
+mousepad
+mumble
+netcat-openbsd
+network-manager-gnome
+normalize-audio
+nscd
+ntfs-3g
+ntpsec-ntpdate
+obs-studio
+okular
+os-prober
+p7zip-full
+pavucontrol
+pdfchain
+plymouth
+plymouth-themes
+recordmydesktop
+samba-common-bin
+sane-airscan
+skanlite
+smartmontools
+sox
+synaptic
+thunar-volman
+thunderbird
+thunderbird-l10n-de
+tmux
+tree
+unace
+unrar-free
+usbutils
+usermode
+va-driver-all
+vdpau-driver-all
+vlc
+x264
+xdotool
+xfce4-goodies
+xfce4-power-manager-plugins
+xfce4-screenshooter
+xserver-xorg-core
+xserver-xorg-input-all
+xserver-xorg-input-wacom
+xserver-xorg-video-all
+xserver-xorg-video-intel
+yt-dlp
+
+## Games - Common ##
+# crawl
+# extremetuxracer
+# fillets-ng
+# flare-game
+# freeciv freeciv-client-sdl
+gnome-2048
+# gearhead gunroar
+# hedgewars hex-a-hop
+kpat
+# supertux supertuxkart
+# torus-trooper
+# wesnoth-1.18 wesnoth-1.18-httt wesnoth-music
+
+## Games - Minetest ##
+# minetest minetest-server
+# minetest-mod-3d-armor
+# minetest-mod-craftguide minetest-mod-ethereal
+# minetest-mod-mesecons minetest-mod-mobs-redo
+# minetest-mod-pipeworks minetest-mod-protector
+# minetest-mod-unified-inventory
+
+## Games - Teenage / Adult ##
+# 0ad flare-game openarena warzone2100

diff --git a/live-dvd.mk b/live-dvd.mk
index ce3c8a2387bcad89d8bd3d5d4fde0e80cc25e0d3..121ed5b252d3a489736872dccf04ce2ecf8f6cb1 100644 (file)
--- a/live-dvd.mk
+++ b/live-dvd.mk
@@ -8,59 +8,9 @@ deb    http://deb.debian.org/debian            ${release}-backports    main
 deb    http://deb.debian.org/debian-security/  ${release}-security     main
 endef
 
-packages += acpi alsa-utils audacity aqemu
-packages += brasero brasero-cdrkit
-packages += chntpw chromium chromium-sandbox chromium-l10n cifs-utils clementine cryptsetup
-packages += debootstrap dosfstools dvdauthor dvd+rw-tools
-packages += eject exfat-fuse exfatprogs
-packages += ffmpeg firefox-esr firefox-esr-l10n-de fonts-liberation fonts-liberation2 frei0r-plugins
-packages += gambas3 gcc gddrescue gdebi genisoimage git gnumeric gparted growisofs gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-x gwenview
-packages += hunspell hunspell-de-de hyphen-de
-packages += inkscape inkscape-tutorials ipython3
-packages += k3b k3b-i18n kcalc kdenlive kde-spectacle kde-style-breeze krita krita-l10n
-packages += locales lazarus libblockdev-crypto3 libc-dev libk3b-extracodecs libreoffice-calc libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze libreoffice-writer lshw lvm2
-packages += man-db manpages-de marble mdadm mesa-utils mousepad mpv mypaint
-packages += nano nbd-client ncat network-manager-gnome normalize-audio ntfs-3g
-packages += okular osspd ovmf oxygencursors
-packages += p7zip-full pavucontrol pdfchain php-cli pulseaudio pulseaudio-module-bluetooth
-packages += qemu-guest-agent qemu-system-x86 qemu-system-gui qemu-utils
-packages += recordmydesktop
-packages += samba-common-bin sane-airscan scribus skanlite smartmontools sox synaptic
-packages += telnet testdisk tmux tree
-packages += unace unrar-free usbutils
-packages += va-driver-all vdpau-driver-all vlc
-packages += whois
-packages += x11-apps x264 xdotool xfce4-goodies xfce4-power-manager-plugins xfce4-timer-plugin xinput xpdf
-packages += yt-dlp zenity
+packages = $(shell grep -v ^# live-dvd.sw)
 
-PACKAGES := $(filter-out xscreensaver,${PACKAGES}) xfce4-screensaver
-
-packages += linux-image-amd64
-# packages += linux-image-6.1.0-25-amd64
-packages += firmware-atheros firmware-brcm80211 firmware-iwlwifi firmware-misc-nonfree firmware-libertas firmware-realtek
-# packages+=firmware-ipw2x00
-
-packages += crawl gearhead
-# packages += 0ad
-packages += extremetuxracer
-# packages += flare-game freeciv freeciv-client-sdl
-packages += hedgewars
-packages += fillets-ng frozen-bubble
-packages += gnome-2048 gunroar
-packages += hex-a-hop
-packages += kpat
-# packages += supertux supertuxkart
-packages += torus-trooper
-# packages += wesnoth-1.16 wesnoth-1.16-httt wesnoth-music
-
-# packages += minetest minetest-server
-# packages += minetest-mod-3d-armor
-# packages += minetest-mod-craftguide minetest-mod-ethereal
-# packages += minetest-mod-mesecons minetest-mod-mobs-redo
-# packages += minetest-mod-pipeworks minetest-mod-protector
-# packages += minetest-mod-unified-inventory
-
-modules=nodm,xfce,gimp,live #,approx
+modules=nodm,xfce,gimp,live,approx
 hostname=live
 rootpass=root
 # rootkey=image_ssh

diff --git a/live-dvd.sw b/live-dvd.sw
new file mode 100644 (file)
index 0000000..45d17da
--- /dev/null
+++ b/live-dvd.sw
@@ -0,0 +1,156 @@
+acpi
+alsa-utils
+aqemu
+audacity
+brasero
+brasero-cdrkit
+chntpw
+chromium
+chromium-l10n
+chromium-sandbox
+cifs-utils
+clementine
+cryptsetup
+debootstrap
+dosfstools
+dvdauthor
+dvd+rw-tools
+eject
+exfat-fuse
+exfatprogs
+ffmpeg
+firefox-esr
+firefox-esr-l10n-de
+fonts-liberation
+fonts-liberation2
+frei0r-plugins
+frozen-bubble
+gambas3
+gcc
+gddrescue
+gdebi
+genisoimage
+git
+gnumeric
+gparted
+growisofs
+gstreamer1.0-plugins-good
+gstreamer1.0-plugins-ugly
+gstreamer1.0-x
+gwenview
+hunspell
+hunspell-de-de
+hyphen-de
+inkscape
+inkscape-tutorials
+ipython3
+k3b
+k3b-i18n
+kcalc
+kdenlive
+kde-style-breeze
+krita
+krita-l10n
+lazarus
+libblockdev-crypto3
+libc-dev
+libk3b-extracodecs
+libreoffice-calc
+libreoffice-gnome
+libreoffice-gtk3
+libreoffice-impress
+libreoffice-l10n-de
+libreoffice-style-breeze
+libreoffice-writer
+linux-image-amd64
+locales
+lshw
+lvm2
+man-db
+manpages-de
+marble
+mdadm
+mesa-utils
+mousepad
+mpv
+mypaint
+nano
+nbd-client
+network-manager-gnome
+normalize-audio
+ntfs-3g
+ntpsec-ntpdate
+okular
+osspd
+ovmf
+oxygencursors
+p7zip-full
+pavucontrol
+pdfchain
+php-cli
+qemu-guest-agent
+qemu-system-gui
+qemu-system-x86
+qemu-utils
+recordmydesktop
+samba-common-bin
+sane-airscan
+scribus
+skanlite
+smartmontools
+sox
+synaptic
+telnet
+testdisk
+tmux
+tree
+unace
+unrar-free
+usbutils
+va-driver-all
+vdpau-driver-all
+vlc
+whois
+x11-apps
+x264
+xdotool
+xfce4-goodies
+xfce4-power-manager-plugins
+xfce4-screenshooter
+xfce4-timer-plugin
+xpdf
+yt-dlp
+
+## Hardware Specific ##
+firmware-atheros
+firmware-brcm80211
+firmware-iwlwifi
+firmware-libertas
+firmware-misc-nonfree
+firmware-realtek
+# firmware-ipw2x00
+
+## Games - Common ##
+crawl
+extremetuxracer
+fillets-ng
+# flare-game
+# freeciv freeciv-client-sdl
+gnome-2048
+gearhead gunroar
+hedgewars hex-a-hop
+kpat
+# supertux supertuxkart
+torus-trooper
+# wesnoth-1.18 wesnoth-1.18-httt wesnoth-music
+
+## Games - Minetest ##
+# minetest minetest-server
+# minetest-mod-3d-armor
+# minetest-mod-craftguide minetest-mod-ethereal
+# minetest-mod-mesecons minetest-mod-mobs-redo
+# minetest-mod-pipeworks minetest-mod-protector
+# minetest-mod-unified-inventory
+
+## Games - Teenage / Adult ##
+# 0ad flare-game openarena warzone2100