Commit d48d7124 authored by Michael Shigorin's avatar Michael Shigorin

regular.mk: use kde4-plasma-nm* plugins

plasma-applet-networkmanager has been superseded by a bunch of kde4-plasma-nm* packages; only the main one has been included in regular-kde4 flavour since the switch resulting in the lack of VPN/mobile connectivity options. My opinion still is that plasma-applet-networkmanager should be returned as a metapackage for p7/branch timespan so that images could be built no matter whether it's sisyphus or p7 at hand. Oh well.
parent 561941a2
......@@ -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; @:
......
......@@ -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-
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
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment