Merge remote-tracking branch 'origin'

diff --git a/live-cd.mk b/live-cd.mk
index 3b04197d930022bef2d8574b2e062aaff01a6bd9..92c0889ccee174188a1a0bfa33429980aa146f3e 100644 (file)
--- a/live-cd.mk
+++ b/live-cd.mk
@@ -29,7 +29,7 @@ packages += linux-image-amd64
 packages += firmware-atheros firmware-brcm80211 firmware-iwlwifi firmware-misc-nonfree firmware-libertas firmware-realtek
 # packages+=firmware-ipw2x00
 
-modules=nodm,xfce,live,approx
+modules=nodm,xfce,live #,approx
 hostname=live
 rootpass=root
 # rootkey=image_ssh

diff --git a/live-dvd.mk b/live-dvd.mk
index a8f96b8a99ccc018dc5901ecfb7596526f6d9315..8f49c173721313fea13f67d2d9b1f52a84c0f7f0 100644 (file)
--- a/live-dvd.mk
+++ b/live-dvd.mk
@@ -2,33 +2,47 @@ include live-cd.mk
 
 iso=live-dvd.iso
 
-packages += audacity
-packages += breeze-icon-theme
-packages += catfish chromium chromium-sandbox chromium-l10n
+packages += audacity aqemu
+packages += blender brasero brasero-cdrkit breeze-icon-theme
+packages += chromium chromium-sandbox chromium-l10n cifs-utils clementine
 packages += dolphin dvdauthor dvd+rw-tools
-packages += ffmpeg frei0r-plugins
-packages += gambas3 gcc genisoimage growisofs gwenview
-packages += hunspell-de-de-frami hyphen-de
+packages += ffmpeg fonts-liberation fonts-liberation2 frei0r-plugins
+packages += gambas3 gcc genisoimage gnumeric 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-i18n kdenlive konsole krita
-packages += lazarus libc-dev libk3b7-extracodecs libreoffice-calc libreoffice-gtk3 libreoffice-l10n-de libreoffice-writer
-packages += marble mencoder mplayer mypaint
+packages += k3b k3b-i18n kcalc kdenlive kde-spectacle kde-style-breeze konsole krita krita-l10n
+packages += locales lazarus libc-dev libk3b-extracodecs libreoffice-calc libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze libreoffice-writer
+packages += marble mencoder mesa-utils mplayer mumble mypaint
 packages += normalize-audio
 packages += obs-studio okular osspd
-packages += php-cli
+packages += pdfchain php-cli
+packages += qemu-system-x86 qemu-system-gui qemu-utils
 packages += recordmydesktop
-packages += scribus sox
-packages += xfce4-power-manager-plugins
-packages += yt-dlp
+packages += samba-common-bin sane-airscan scribus skanlite sox
+packages += va-driver-all vdpau-driver-all
+packages += x264 xdotool xfce4-goodies xfce4-power-manager-plugins
+packages += yt-dlp zenity
 
-packages += extremetuxracer hedgewars frozen-bubble gnome-2048 kpat supertuxkart torus-trooper
-packages += minetest minetest-mod-craftguide minetest-mod-ethereal minetest-mod-mesecons minetest-mod-mobs-redo minetest-mod-pipeworks minetest-mod-player-3d-armor minetest-mod-protector minetest-mod-unified-inventory
+# 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
 
-modules+=,gimp
+# 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
 
-_favorites: _xfce
-       printf 'favorites=debian-installer-launcher.desktop,libreoffice-startcenter.desktop,firefox-esr.desktop,xfce4-terminal.desktop,org.kde.dolphin.desktop,mousepad.desktop,synaptic.desktop,aqemu.desktop,gparted.desktop' \
-       >"$${CFGROOT}/etc/xdg/xfce4/panel/whiskermenu-10.rc"
+modules+=,gimp
 
 # Bugfix: prevent warning from faulty dolphin config
 _config: cfg_root/usr/share/kxmlgui5/dolphin/dolphinui.rc

diff --git a/modules/approx.mk b/modules/approx.mk
index e221b0381c0cc18a393b1c3a5b6bab0c0959f7e5..0847c0bf6036bb6a4b86c16a81d53dbfa7c1ae78 100644 (file)
--- a/modules/approx.mk
+++ b/modules/approx.mk
@@ -9,7 +9,8 @@ endif
 
 approxrepos := main
 approxrepos += $(findstring contrib, ${SOURCES})
-approxrepos += $(findstring non-free, ${SOURCES})
+approxrepos += $(findstring non-free-fimware, ${SOURCES})
+#approxrepos += $(findstring non-free, ${SOURCES})
 
 ifdef approx
   BOOTSTRAP := ${approx}

diff --git a/modules/default.mk b/modules/default.mk
index fa1d840bcf439e68639b9f0b7898535f5065a794..efb83589b198ad0cf78d19d14c688504092f3b55 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -107,7 +107,7 @@ ${rootkey}.pub:
        [ -f "$@" ] || ssh-keygen -N '' -f "$${rootkey}"
 
 _rootkey: ${CFGROOT} ${rootkey}.pub
-       mkdir -m 700 "$${CFGROOT}/root/.ssh/"
+       mkdir -pm 700 "$${CFGROOT}/root/.ssh/"
        cp "$${rootkey}.pub" "$${CFGROOT}/root/.ssh/authorized_keys"
 
 _users: ${CFGROOT}