diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 15b4c361..c26bf4e6 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -134,7 +134,7 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \ distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \ use/fonts/zerg +pulse +plymouth +nm - @$(call add,LIVE_LISTS,$(call tags,regular kde4)) + @$(call add,LIVE_LISTS,$(call tags,(regular || network) && kde4)) @$(call add,LIVE_PACKAGES,rosa-imagewriter) distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @: diff --git a/pkg.in/lists/tagged/base+kde4mobile b/pkg.in/lists/tagged/base+kde4mobile index 17d7fc8f..032a4fb3 100644 --- a/pkg.in/lists/tagged/base+kde4mobile +++ b/pkg.in/lists/tagged/base+kde4mobile @@ -16,14 +16,4 @@ vlc-mini libqt4-sql-sqlite -NetworkManager -NetworkManager-vpnc -NetworkManager-openvpn -NetworkManager-pptp wpa_gui - -kde4-plasma-nm -NetworkManager-applet-gtk- -NetworkManager-openvpn-gtk- -NetworkManager-pptp-gtk- -NetworkManager-vpnc-gtk- diff --git a/pkg.in/lists/tagged/network+kde4 b/pkg.in/lists/tagged/network+kde4 new file mode 100644 index 00000000..76d557aa --- /dev/null +++ b/pkg.in/lists/tagged/network+kde4 @@ -0,0 +1,18 @@ +NetworkManager +NetworkManager-vpnc +NetworkManager-openvpn +NetworkManager-pptp + +NetworkManager-applet-gtk- +NetworkManager-openvpn-gtk- +NetworkManager-pptp-gtk- +NetworkManager-vpnc-gtk- + +kde4-plasma-nm +kde4-plasma-nm-connect-l2tp +kde4-plasma-nm-connect-mobile +kde4-plasma-nm-connect-openconnect +kde4-plasma-nm-connect-openvpn +kde4-plasma-nm-connect-pptp +kde4-plasma-nm-connect-strongswan +kde4-plasma-nm-connect-vpnc diff --git a/pkg.in/lists/tagged/regular+kde4 b/pkg.in/lists/tagged/regular+kde4 index f6544ef1..ea524d9a 100644 --- a/pkg.in/lists/tagged/regular+kde4 +++ b/pkg.in/lists/tagged/regular+kde4 @@ -5,20 +5,6 @@ phonon-gstreamer synaptic-kde synaptic-usermode- -kde4-plasma-nm -kde4-plasma-nm-connect-l2tp -kde4-plasma-nm-connect-mobile -kde4-plasma-nm-connect-openconnect -kde4-plasma-nm-connect-openvpn -kde4-plasma-nm-connect-pptp -kde4-plasma-nm-connect-strongswan -kde4-plasma-nm-connect-vpnc - -NetworkManager-applet-gtk- -NetworkManager-openvpn-gtk- -NetworkManager-pptp-gtk- -NetworkManager-vpnc-gtk- - gtk2-theme-oxygen-gtk gtk3-theme-oxygen-gtk