diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk index 4fe29db1..6662542a 100644 --- a/conf.d/desktop.mk +++ b/conf.d/desktop.mk @@ -9,7 +9,6 @@ distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @: distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @: distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @: -distro/ltsp-tde: distro/tde +ltsp; @: distro/ltsp-icewm: distro/icewm +ltsp; @: endif diff --git a/conf.d/live.mk b/conf.d/live.mk index 1c782c3c..515f2360 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -43,7 +43,6 @@ distro/live-install: distro/.live-base use/live/textinstall; @: distro/.livecd-install: distro/.live-base use/live/install; @: distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @: -distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @: distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @: distro/live-rescue: distro/live-icewm +efi diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index c6ea49ba..633a02d0 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -94,11 +94,6 @@ mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm @$(call add,THE_PACKAGES,qasmixer qpdfview) @$(call set,THE_IMAGEWRITER,rosa-imagewriter) -mixin/regular-tde: +tde \ - use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat - @$(call add,THE_PACKAGES_REGEXP,kdeedu-kalzium.* kdeedu-ktouch.*) - @$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd) - mixin/regular-lxqt: use/x11/lxqt use/x11/sddm use/x11/gtk/nm +nm @$(call set,THE_IMAGEWRITER,rosa-imagewriter) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 1bab36b6..a4c9fad4 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -157,12 +157,6 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ @$(call add,LIVE_PACKAGES,gnome-flashback screenpen) @$(call add,DEFAULT_SERVICES_ENABLE,gdm) -distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \ - use/x11/gtk/nm use/net/nm/mmgui - -distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \ - use/net-eth/dhcp use/efi/refind; @: - distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \ use/browser/falkon @$(call add,THE_LISTS,$(call tags,lxqt desktop)) @@ -193,11 +187,6 @@ distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue @$(call set,META_VOL_ID,ALT Rescue) @$(call set,META_APP_ID,$(ARCH)) -distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde - @$(call add,THE_LISTS,$(call tags,base desktop)) - @$(call add,THE_LISTS,$(call tags,regular tde)) - @$(call add,THE_PACKAGES,kpowersave) - distro/regular-sysv-xfce: distro/.regular-install-x11-full \ mixin/regular-xfce mixin/regular-xfce-sysv @$(call add,THE_PACKAGES,nload) diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index 44c2ad98..da8e206f 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -88,9 +88,6 @@ use/x11/xdm: use/x11/dm use/x11/icewm: use/x11 @$(call add,THE_LISTS,$(call tags,icewm desktop)) -use/x11/tde: use/x11 - @$(call add,THE_LISTS,$(call tags,tde desktop)) - use/x11/kde/synaptic: @$(call add,THE_PACKAGES,synaptic-kde synaptic-usermode-) diff --git a/pkg.in/lists/tagged/desktop+tde b/pkg.in/lists/tagged/desktop+tde deleted file mode 100644 index 12e66e40..00000000 --- a/pkg.in/lists/tagged/desktop+tde +++ /dev/null @@ -1,13 +0,0 @@ -tde-regular -kde-i18n-ru -kde-i18n-uk - -# rom_as@ says it's still needed -hal -arts - -# Speccyfighter says it's needed too -hmount - -# how could this get skipped? -filelight