diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk index 3e5b6494..b3b70632 100644 --- a/conf.d/desktop.mk +++ b/conf.d/desktop.mk @@ -17,7 +17,7 @@ distro/.desktop-extra: distro/tde: distro/.desktop-mini +tde @$(call set,KFLAVOURS,led-ws) -distro/kde-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde +distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite @$(call set,KFLAVOURS,std-def) distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @: diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index 95842c7c..73f2600e 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -1,7 +1,7 @@ +icewm: use/x11/icewm; @: +razorqt: use/x11/razorqt use/x11/lightdm/qt; @: +tde: use/x11/tde use/x11/kdm; @: -+kde: use/x11/kde use/x11/kdm4; @: ++kde4-lite: use/x11/kde4-lite use/x11/kdm4; @: use/x11/xorg: @$(call add_feature) @@ -52,8 +52,8 @@ use/x11/razorqt: use/x11/xorg use/x11/tde: use/x11/xorg @$(call add,THE_LISTS,$(call tags,tde desktop)) -use/x11/kde: use/x11/xorg - @$(call add,THE_LISTS,$(call tags,kde desktop)) +use/x11/kde4-lite: use/x11/xorg + @$(call add,THE_LISTS,$(call tags,kde4 desktop)) use/x11/kde4: use/x11/xorg @$(call add,THE_PACKAGES,kde4-default) diff --git a/pkg.in/lists/tagged/desktop+kde b/pkg.in/lists/tagged/desktop+kde4 similarity index 100% rename from pkg.in/lists/tagged/desktop+kde rename to pkg.in/lists/tagged/desktop+kde4 diff --git a/pkg.in/lists/tagged/desktop+kde+extra b/pkg.in/lists/tagged/desktop+kde4+extra similarity index 100% rename from pkg.in/lists/tagged/desktop+kde+extra rename to pkg.in/lists/tagged/desktop+kde4+extra