[SCM] debian-live/config-webc branch, master, updated. 2776d949138490784e0cc357e40f05b829bf7693

[Kai Hendry]

The following commit has been merged in the master branch:
commit 2776d949138490784e0cc357e40f05b829bf7693
Author: Kai Hendry <hendry at iki.fi>
Date:   Wed Mar 26 07:28:37 2008 +0000

    maxi works again

diff --git a/webconverger/config/binary b/webconverger/config/binary
index de8b7fc..b16c4f1 100644
--- a/webconverger/config/binary
+++ b/webconverger/config/binary
@@ -6,7 +6,7 @@
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LH_BINARY_IMAGES="usb-hdd"
+#LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
@@ -22,7 +22,7 @@ LH_BOOTAPPEND_LIVE="quiet iceweaselupgrade homepage=http://portal.webconverger.c
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-#LH_BOOTLOADER="grub"
+LH_BOOTLOADER="grub"
 
 # $LH_CHECKSUMS: set checksums
 # (Default: enabled)
@@ -111,7 +111,7 @@ LH_ISO_VOLUME="Webconverger $(date +%Y%m%d-%H:%M)"
 
 # $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-#LH_SYSLINUX_SPLASH=""
+LH_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
 
 # $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
 # (Default: 0)
diff --git a/webconverger/config/bootstrap b/webconverger/config/bootstrap
index f1abc0d..1c46200 100644
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@ -50,4 +50,4 @@ LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
 
 # $LH_SECTIONS: select section(s) to use
 # (Default: main)
-LH_SECTIONS="main contrib"
+LH_SECTIONS="main contrib non-free"
diff --git a/webconverger/config/chroot_local-packageslists/iceweasel-l10n b/webconverger/config/chroot_local-packageslists/iceweasel-l10n
index c605cff..61bf04d 100644
--- a/webconverger/config/chroot_local-packageslists/iceweasel-l10n
+++ b/webconverger/config/chroot_local-packageslists/iceweasel-l10n
@@ -6,17 +6,17 @@
 #iceweasel-l10n-cs - Czech language package for Iceweasel
 #iceweasel-l10n-cy-gb - Welsh language package for Iceweasel
 #iceweasel-l10n-da - Danish language package for Iceweasel
-#iceweasel-l10n-de - German language package for Iceweasel
+iceweasel-l10n-de
 #iceweasel-l10n-dz-bt - Dzongkha language package for Iceweasel
 #iceweasel-l10n-el - Greek language package for Iceweasel
-#iceweasel-l10n-en-gb - English (Great Britain) language package for Iceweasel
+iceweasel-l10n-en-gb
 #iceweasel-l10n-es-ar - Spanish (Argentina) language package for Iceweasel
-#iceweasel-l10n-es-es - Spanish (Spain) language package for Iceweasel
+iceweasel-l10n-es-es
 #iceweasel-l10n-et-ee - Estonian language package for Iceweasel
 #iceweasel-l10n-eu - Basque language package for Iceweasel
 #iceweasel-l10n-fa-ir - Persian language package for Iceweasel
-#iceweasel-l10n-fi - Finnish language package for Iceweasel
-#iceweasel-l10n-fr - French language package for Iceweasel
+iceweasel-l10n-fi
+iceweasel-l10n-fr
 #iceweasel-l10n-fur-it - Furlan language package for Iceweasel
 #iceweasel-l10n-fy-nl - Frisian language package for Iceweasel
 #iceweasel-l10n-ga-ie - Irish (Ireland) language package for Iceweasel
@@ -24,9 +24,9 @@
 #iceweasel-l10n-he - Hebrew language package for Iceweasel
 #iceweasel-l10n-hu - Hungarian language package for Iceweasel
 #iceweasel-l10n-it - Italian language package for Iceweasel
-#iceweasel-l10n-ja - Japanese language package for Iceweasel
+iceweasel-l10n-ja
 #iceweasel-l10n-ka - Georgian language package for Iceweasel
-#iceweasel-l10n-ko - Korean language package for Iceweasel
+iceweasel-l10n-ko
 #iceweasel-l10n-ku - Kurdish language package for Iceweasel
 #iceweasel-l10n-lt - Lithuanian language package for Iceweasel
 #iceweasel-l10n-mk - Macedonian language package for Iceweasel
@@ -43,8 +43,8 @@
 #iceweasel-l10n-ru - Russian language package for Iceweasel
 #iceweasel-l10n-sk - Slovak language package for Iceweasel
 #iceweasel-l10n-sl - Slovenian language package for Iceweasel
-#iceweasel-l10n-sv-se - Swedish (Sweden) language package for Iceweasel
+iceweasel-l10n-sv-se
 #iceweasel-l10n-tr - Turkish language package for Iceweasel
 #iceweasel-l10n-uk-ua - Ukrainian language package for Iceweasel
-#iceweasel-l10n-zh-cn - Chinese (China) language package for Iceweasel
-#iceweasel-l10n-zh-tw - Chinese (Taiwan) language package for Iceweasel
+iceweasel-l10n-zh-cn
+iceweasel-l10n-zh-tw
diff --git a/webconverger/config/chroot_local-packageslists/myspell b/webconverger/config/chroot_local-packageslists/myspell
index d5b0b3a..c203fba 100644
--- a/webconverger/config/chroot_local-packageslists/myspell
+++ b/webconverger/config/chroot_local-packageslists/myspell
@@ -1,4 +1,4 @@
-myspell-bg
+#myspell-bg
 myspell-ca
 myspell-cs-cz
 myspell-da
@@ -13,15 +13,15 @@ myspell-es
 myspell-es
 myspell-fi
 myspell-fr
-myspell-fr-gut
+#myspell-fr-gut
 myspell-he
 myspell-hu
 myspell-it
 myspell-ku
 myspell-lt
-myspell-nb
+#myspell-nb
 myspell-nl
-myspell-nn
+#myspell-nn
 myspell-pl
 myspell-pt
 myspell-pt-br

-- 
debian-live/config-webc