[SCM] debian-live/config-webc branch, master, updated. 56522dfd9170338d4454ffceb2383cf7fd6c4638

[Kai Hendry]

The following commit has been merged in the master branch:
commit 56522dfd9170338d4454ffceb2383cf7fd6c4638
Author: Kai Hendry <hendry at iki.fi>
Date:   Sat Jul 12 07:55:36 2008 +0000

    PDF restored (removed for webkit)

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/bootstrap b/webconverger/config/bootstrap
index 7d9e1ce..1c55fa6 100644
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@ -2,7 +2,7 @@
 
 # $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-#LH_ARCHITECTURE="i386"
+LH_ARCHITECTURE="i386"
 
 # $LH_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
@@ -26,27 +26,27 @@
 
 # $LH_DISTRIBUTION: select distribution to use
 # (Default: lenny)
-#LH_DISTRIBUTION="sid"
+LH_DISTRIBUTION="lenny"
 
 # $LH_MIRROR_BOOTSTRAP: set mirror to boostrap from
 # (Default: http://ftp.us.debian.org/debian/)
-LH_MIRROR_BOOTSTRAP="http://debian.virginmedia.com/"
+#LH_MIRROR_BOOTSTRAP="http://debian.virginmedia.com/"
 
 # $LH_MIRROR_CHROOT: set mirror to fetch packages from
 # (Default: http://ftp.us.debian.org/debian/)
-LH_MIRROR_CHROOT="http://debian.virginmedia.com/"
+#LH_MIRROR_CHROOT="http://debian.virginmedia.com/"
 
 # $LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
-LH_MIRROR_CHROOT_SECURITY="http://ftp.de.debian.org/debian-security/"
+#LH_MIRROR_CHROOT_SECURITY="http://ftp.de.debian.org/debian-security/"
 
 # $LH_MIRROR_BINARY: set mirror which ends up in the image
 # (Default: http://ftp.us.debian.org/debian/)
-LH_MIRROR_BINARY="http://debian.virginmedia.com/"
+#LH_MIRROR_BINARY="http://debian.virginmedia.com/"
 
 # $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
-LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
+#LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
 
 # $LH_SECTIONS: select section(s) to use
 # (Default: main)
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