[SCM] debian-live/config-webc branch, master, updated. 8a0538058843246c83c8ce1a45606e89238ca0ac

[Kai Hendry]

The following commit has been merged in the master branch:
commit ce1f58d1c5b47affa4b1baed957a30462c177385
Author: Kai Hendry <hendry at iki.fi>
Date:   Fri Aug 29 15:35:27 2008 +0100

    3.3b

diff --git a/mini/config/chroot_local-packageslists/en b/mini/config/chroot_local-packageslists/en
deleted file mode 100644
index a15c004..0000000
--- a/mini/config/chroot_local-packageslists/en
+++ /dev/null
@@ -1,2 +0,0 @@
-#myspell-en-us
-myspell-en-gb
diff --git a/mini/config/chroot_local-packageslists/kiosk b/mini/config/chroot_local-packageslists/kiosk
deleted file mode 100644
index f115e11..0000000
--- a/mini/config/chroot_local-packageslists/kiosk
+++ /dev/null
@@ -1,6 +0,0 @@
-# For locking down the browser
-#iceweasel-webcnoaddressbar
-
-#Usually just
-iceweasel-webconverger
-#libwebkit-1.0-1
diff --git a/mini/config/chroot_local-packageslists/webconverger b/mini/config/chroot_local-packageslists/webconverger
deleted file mode 120000
index dc9ae27..236d293
--- a/mini/config/chroot_local-packageslists/webconverger
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_local-packageslists/webconverger
\ No newline at end of file
diff --git a/mini/config/chroot_local-packageslists/webconverger b/mini/config/chroot_local-packageslists/webconverger
new file mode 100644
index dc9ae27..236d293
--- /dev/null
+++ b/mini/config/chroot_local-packageslists/webconverger
@@ -0,0 +1,49 @@
+# Webconverger's main configuration hendry at webconverger.com
+# Minimal
+eject file sudo
+
+# Standard
+console-common kbd locales
+
+# X11
+xorg xresprobe discover menu
+
+# Sound
+alsa-base alsa-oss alsa-utils
+
+# For upgrade, firewall et al. features
+live-initscripts
+
+webconverger-base
+webconverger-archive-keyring
+
+iceweasel
+
+# Window manager
+dwm
+
+# For the background
+xloadimage
+
+# fonts
+ttf-dejavu
+ttf-gentium
+
+# pdf
+xpdf mozplugger
+
+# bootscreen
+splashy
+
+########## non-free software
+flashplugin-nonfree
+
+#myspell-en-us
+myspell-en-gb
+
+# For locking down the browser
+#iceweasel-webcnoaddressbar
+
+#Usually just
+iceweasel-webconverger
+#libwebkit-1.0-1
diff --git a/webconverger/config/binary_debian-installer/preseed.cfg b/webconverger/config/binary_debian-installer/preseed.cfg
index b09b843..1e7a166 100644
--- a/webconverger/config/binary_debian-installer/preseed.cfg
+++ b/webconverger/config/binary_debian-installer/preseed.cfg
@@ -66,4 +66,4 @@ d-i     popularity-contest/participate  boolean false
 # Process custom postinst
 d-i     preseed/late_command string sh  /cdrom/install/late_command.sh
 
-d-i     debian-installer/add-kernel-opts        string   splash vga=791
+d-i     debian-installer/add-kernel-opts        string   splash vga=791 nosudo
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index b05151a..18d86d6 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -17,6 +17,8 @@ live-initscripts
 webconverger-base
 webconverger-archive-keyring
 
+iceweasel
+
 # Window manager
 dwm
 
@@ -28,10 +30,10 @@ ttf-dejavu
 ttf-gentium
 
 # pdf
-#xpdf mozplugger
+xpdf mozplugger
 
 # bootscreen
 splashy
 
 ########## non-free software
-#flashplugin-nonfree
+flashplugin-nonfree

-- 
debian-live/config-webc