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

[Kai Hendry]

The following commit has been merged in the master branch:
commit ae316e7b86e654915e5a81fa9fc240ed59ec05cd
Author: Kai Hendry <hendry at iki.fi>
Date:   Mon Aug 11 18:02:37 2008 +0100

    experimenting

diff --git a/mini/config/chroot_apt/preferences b/mini/config/chroot_apt/preferences
index c325b08..f6ecef6 100644
--- a/mini/config/chroot_apt/preferences
+++ b/mini/config/chroot_apt/preferences
@@ -1,13 +1,3 @@
 Package: *
 Pin: release o=webconverger
 Pin-Priority: 1001
-
-Explanation: Sid
-Package: iceweasel
-Pin: release a=unstable
-Pin-Priority:1001
-
-Explanation: Sid
-Package: udev
-Pin: release a=testing
-Pin-Priority:1002
diff --git a/mini/config/chroot_local-packageslists/kiosk b/mini/config/chroot_local-packageslists/kiosk
index fae1b83..f115e11 100644
--- a/mini/config/chroot_local-packageslists/kiosk
+++ b/mini/config/chroot_local-packageslists/kiosk
@@ -3,3 +3,4 @@
 
 #Usually just
 iceweasel-webconverger
+#libwebkit-1.0-1
diff --git a/webconverger/config/bootstrap b/webconverger/config/bootstrap
index 1c55fa6..a722a90 100644
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@ -30,11 +30,11 @@ 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/)
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index 3396de6..b05151a 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -23,18 +23,15 @@ dwm
 # For the background
 xloadimage
 
-# For reseting the kiosk
-xautolock
-
 # fonts
 ttf-dejavu
 ttf-gentium
 
 # pdf
-xpdf mozplugger
+#xpdf mozplugger
 
 # bootscreen
 splashy
 
 ########## non-free software
-flashplugin-nonfree
+#flashplugin-nonfree
diff --git a/webconverger/config/chroot_sources/unstable.chroot b/webconverger/config/chroot_sources/unstable.chroot
deleted file mode 100644
index 9338ed1..0000000
--- a/webconverger/config/chroot_sources/unstable.chroot
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ftp.nl.debian.org/debian/ unstable main contrib non-free

-- 
debian-live/config-webc