regular.mk: update lxde, engineering flavours

- switch browser from firefox to palemoon (firefox needed pulseaudio) - switch LXDE theme from upstream to lxdesktop (cf. ALT Engineering) - added qastool: ALSA mixer GUI - added qpdfview: PDF viewer (there was none) - update regular-engineering pkglist

regular.mk: update lxde, engineering flavours
93f5dd7d · Anton Midyukov · Michael Shigorin · 2a2b3e1b · 93f5dd7d · 93f5dd7d
Commit 93f5dd7d authored Jan 14, 2018 by Anton Midyukov Committed by Michael Shigorin Jan 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

mixin.mk conf.d/mixin.mk +2 -1

regular.mk conf.d/regular.mk +0 -3

desktop+lxde pkg.in/lists/tagged/desktop+lxde +1 -1

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -48,8 +48,9 @@ mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
 	@$(call add,THE_PACKAGES,pnmixer pm-utils elinks mpg123)

 mixin/regular-lxde: use/x11/lxde use/fonts/infinality \
-	use/x11/gtk/nm use/im +nm +alsa
+	use/x11/gtk/nm use/im use/browser/palemoon/i18n +nm +alsa
 	@$(call add,LIVE_LISTS,$(call tags,desktop gvfs))
+	@$(call add,THE_PACKAGES,qasmixer qpdfview)

 mixin/regular-tde: +tde \
 	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -284,14 +284,11 @@ distro/regular-server-samba4: distro/.regular-server-managed
 	@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)

 distro/regular-engineering: distro/regular-lxde use/live/ru
-	@$(call add,THE_PACKAGES,lxde-settings-lxdesktop)
 	@$(call add,THE_LISTS,$(call tags,engineering desktop))
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
 	@$(call add,THE_PACKAGES,LibreOffice LibreOffice-gnome LibreOffice-langpack-ru)
-	@$(call add,THE_PACKAGES,firefox-pepperflash)
 	@$(call add,THE_PACKAGES,cups system-config-printer)
 	@$(call add,THE_PACKAGES,gnome-disk-utility)
-	@$(call add,THE_PACKAGES,evince)
 	@$(call add,LIVE_KMODULES,staging)
 	@$(call add,DEFAULT_SERVICES_ENABLE,cups)
 	@$(call add,DEFAULT_SERVICES_ENABLE,ModemManager)

--- a/pkg.in/lists/tagged/desktop+lxde
+++ b/pkg.in/lists/tagged/desktop+lxde
@@ -20,7 +20,7 @@ menu-cache
 altlinux-freedesktop-menu-lxde

 # NB: an lxde-settings is required by lxde-common
-lxde-settings-upstream
+lxde-settings-lxdesktop

 lxde-icon-theme
 tango-icon-theme