[SCM] debian-live/config-webc branch, master, updated. 4c3ca62445a995241d0ea6f06385b72332b1fa76

[Kai Hendry]

The following commit has been merged in the master branch:
commit cd2fcf957fcf19d891f36d4db3d0a9319b1fa9f6
Author: Kai Hendry <hendry at iki.fi>
Date:   Wed Jul 16 19:53:26 2008 +0100

    x61 readying for merge

diff --git a/mini/config/binary b/mini/config/binary
index 8e1e3f1..e99ddf3 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -14,11 +14,11 @@ LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com nosudo splash
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LH_BINARY_IMAGES="usb-hdd"
+#LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux) for LH_BINARY_IMAGES="usb-hdd"
-#LH_BOOTLOADER="grub"
+LH_BOOTLOADER="grub"
 
 # $LH_CHECKSUMS: set checksums
 # (Default: enabled)
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index 56c01f2..3396de6 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -31,7 +31,7 @@ ttf-dejavu
 ttf-gentium
 
 # pdf
-# xpdf mozplugger
+xpdf mozplugger
 
 # bootscreen
 splashy
diff --git a/webconverger/config/chroot_sources/unstable.chroot b/webconverger/config/chroot_sources/unstable.chroot
index f256e0a..9338ed1 100644
--- a/webconverger/config/chroot_sources/unstable.chroot
+++ b/webconverger/config/chroot_sources/unstable.chroot
@@ -1 +1 @@
-#deb http://ftp.nl.debian.org/debian/ unstable main contrib non-free
+deb http://ftp.nl.debian.org/debian/ unstable main contrib non-free

-- 
debian-live/config-webc