From 3a4ba20a0f9f6bfbcfd1e8a262fa62ef2b808504 Mon Sep 17 00:00:00 2001
From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Date: Tue, 17 Apr 2012 16:16:47 +0400
Subject: [PATCH] some fixes in slinux lists and configuration

use/slinux-live: in p6 slinux had install-dvd version too
lists/slinux/misc-dvd: user 3d-proprietary comes from use/x11/3d-proprietary
lists/slinux/misc-dvd:restore compiz
slinux: use/syslinux/localboot.cfg
---
 conf.d/live.mk                   | 13 ++++++++++---
 features.in/slinux/config.mk     |  3 +++
 pkg.in/lists/slinux/live-install |  1 +
 pkg.in/lists/slinux/misc         | 23 +++++++++++++++--------
 pkg.in/lists/slinux/misc-dvd     |  9 ---------
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/conf.d/live.mk b/conf.d/live.mk
index fee93417..017cb35b 100644
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -31,7 +31,7 @@ distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
 distro/live-install: distro/.live-base use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,live-install)
 
-distro/livecd-install: distro/.live-base use/syslinux/localboot.cfg
+distro/.livecd-install: distro/.live-base
 	@$(call add,LIVE_PACKAGES,livecd-install)
 
 distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
@@ -54,8 +54,15 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
 	@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
 	@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
 
-distro/live-simply: distro/livecd-install use/slinux use/systemd \
-	use/firmware/wireless use/x11/drm use/x11/3d-proprietary; @:
+distro/live-simply: distro/.livecd-install use/isohybrid use/slinux-live use/systemd \
+	use/firmware/wireless use/x11/drm use/x11/3d-proprietary use/syslinux/ui/gfxboot
+	@$(call set,BRANDING,simply-linux)
+
+distro/live-simply-fast: distro/live-simply
+	@$(call set,SQUASHFS,fast)
+
+distro/live-simply-tight: distro/live-simply
+	@$(call set,SQUASHFS,tight)
 
 distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
 	use/x11/cinnamon use/x11/3d-free
diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk
index 4482ab0c..e766df67 100644
--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -12,3 +12,6 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
 	@$(call add,THE_LISTS,slinux/xfce)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
 	@$(call add,THE_PACKAGES,apt-conf-sisyphus)
+
+use/slinux-live: use/slinux
+	@$(call add,THE_LISTS,slinux/live-install)
diff --git a/pkg.in/lists/slinux/live-install b/pkg.in/lists/slinux/live-install
index 540c203f..268150fb 100644
--- a/pkg.in/lists/slinux/live-install
+++ b/pkg.in/lists/slinux/live-install
@@ -1 +1,2 @@
 installer-feature-simply-livecd
+livecd-setlocale
diff --git a/pkg.in/lists/slinux/misc b/pkg.in/lists/slinux/misc
index c62e19df..1fa0c944 100644
--- a/pkg.in/lists/slinux/misc
+++ b/pkg.in/lists/slinux/misc
@@ -3,8 +3,6 @@ fvwm-full-
 altlinux-freedesktop-menu-shallow-menu
 altlinux-freedesktop-menu-icon-theme-default
 #altlinux-freedesktop-menu-common
-branding-simply-linux-xfce-settings
-branding-simply-linux-menu
 docs-simply-linux
 docs-linux_intro
 fonts-ttf-droid
@@ -15,12 +13,18 @@ gnome-system-monitor
 gnome-icon-theme
 #tango-icon-theme
 #tango-icon-theme-extras
-gdm2.20
-gdm-theme-simply
 gdm2.20-help
 ntfsprogs-
 driconf-
 
+# Branding things
+branding-simply-linux-xfce-settings
+branding-simply-linux-menu
+
+#added through use/syslinux/gfx... ?
+#branding-simply-linux-bootloader
+gdm-theme-simply
+
 kde4libs-
 kde-common-
 kde3-menu-common-
@@ -68,14 +72,17 @@ alterator-xkb
 alterator-pkg
 alterator-packages
 alterator-datetime
+alterator-standalone
+alterator-sysconfig
 
-#additional
+# Additional
 gnome-search-tool
 yelp
 
-#compiz
-#python-module-fusion-icon-gtk
-#compiz-gtk
+# Compiz things
+compiz
+python-module-fusion-icon-gtk
+compiz-gtk
 
 #aen
 #elinks-
diff --git a/pkg.in/lists/slinux/misc-dvd b/pkg.in/lists/slinux/misc-dvd
index c109266d..0c9fce39 100644
--- a/pkg.in/lists/slinux/misc-dvd
+++ b/pkg.in/lists/slinux/misc-dvd
@@ -7,15 +7,6 @@ stardict-slovnyk_en-uk
 stardict-slovnyk_uk-en
 stardict-slovnyk_uk-ru
 
-# NVIDIA drivers
-kernel-modules-nvidia-std-def
-nvidia-xconfig
-
-# ATI proprietary driver
-fglrx_glx
-fglrx-tools
-kernel-modules-fglrx-std-def
-
 vlock
 
 hplip-PPDs