regular.mk: moved openscada to regular-tde

It's been added to al of tde-based images but it looks like LiveCDs make more sense, and it's the regular-tde.iso that hits both regular builds and starterkits; let's put it there and hope it gets spotted appropriately.

regular.mk: moved openscada to regular-tde
80c34ffa · Michael Shigorin · c17370da · 80c34ffa
Commit 80c34ffa authored May 31, 2015 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

regular.mk conf.d/regular.mk +2 -2

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -150,11 +150,11 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 mixin/regular-tde: +tde \
 	use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
 	@$(call add,THE_PACKAGES,kdeedu)
-	@$(call add,THE_LISTS,openscada)
 	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluez)

 distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
-	use/x11/gtk/nm use/net/nm/mmgui; @:
+	use/x11/gtk/nm use/net/nm/mmgui
+	@$(call add,THE_LISTS,openscada)

 distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
 	use/net-eth/dhcp use/efi/refind; @: