keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Michael Shigorin 2014-04-29 15:32:53 +04:00
parent 561941a276
commit d48d712414
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/regular.mk
View File

@ -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 \ distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
use/fonts/zerg +pulse +plymouth +nm 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) @$(call add,LIVE_PACKAGES,rosa-imagewriter)
distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @: distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @:

10
pkg.in/lists/tagged/base+kde4mobile
View File

@ -16,14 +16,4 @@ vlc-mini
libqt4-sql-sqlite libqt4-sql-sqlite
NetworkManager
NetworkManager-vpnc
NetworkManager-openvpn
NetworkManager-pptp
wpa_gui wpa_gui
kde4-plasma-nm
NetworkManager-applet-gtk-
NetworkManager-openvpn-gtk-
NetworkManager-pptp-gtk-
NetworkManager-vpnc-gtk-

18
pkg.in/lists/tagged/network+kde4 Normal file
View File

@ -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

14
pkg.in/lists/tagged/regular+kde4
View File

@ -5,20 +5,6 @@ phonon-gstreamer
synaptic-kde synaptic-kde
synaptic-usermode- 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 gtk2-theme-oxygen-gtk
gtk3-theme-oxygen-gtk gtk3-theme-oxygen-gtk