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

[Kai Hendry]

The following commit has been merged in the master branch:
commit a06c3acef6e8f7c038f271b63584abc3662bece7
Author: Kai Hendry <hendry at iki.fi>
Date:   Thu Jul 10 19:28:26 2008 +0100

    preference to testing/lenny

diff --git a/mini/config/binary b/mini/config/binary
index cd2df25..8e1e3f1 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -10,15 +10,15 @@
 
 # $LH_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com nosudo splash vga=791 kioskresetstation=2"
+LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com nosudo splash vga=791"
 
 # $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/mini/config/chroot_local-hooks/stripped b/mini/config/chroot_local-hooks/stripped
deleted file mode 100755
index 36a5b54..0000000
--- a/mini/config/chroot_local-hooks/stripped
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# /usr/share/live-helper/hooks/stripped - hook list for live-helper(7)
-# Copyright (C) 2006-2008 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Removing unused packages
-# python-2.5
-# Rip out X extensions
-for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute \
-perl-doc \
-gcc-4.2-base \
-gcc-4.3-base \
-xserver-xorg-input-synaptics \
-xserver-xorg-video-apm \
-xserver-xorg-video-chips \
-xserver-xorg-video-imstt \
-xserver-xorg-video-mga \
-xserver-xorg-video-neomagic \
-xserver-xorg-video-newport \
-xserver-xorg-video-nsc \
-xserver-xorg-video-rendition \
-xserver-xorg-video-s3 \
-xserver-xorg-video-s3virge \
-xserver-xorg-video-savage \
-xserver-xorg-video-siliconmotion \
-xserver-xorg-video-sisusb \
-xserver-xorg-video-tdfx \
-xserver-xorg-video-tga \
-xserver-xorg-video-trident \
-xserver-xorg-video-tseng \
-xserver-xorg-video-v4l \
-xserver-xorg-video-vga \
-xserver-xorg-input-wacom \
-xserver-xorg-video-ark \
-xserver-xorg-video-cirrus \
-xserver-xorg-video-cyrix \
-xserver-xorg-video-dummy \
-xserver-xorg-video-fbdev \
-xserver-xorg-video-glint
-do
-	if ! apt-get remove --purge --yes "${PACKAGE}"
-	then
-		echo "WARNING: ${PACKAGE} isn't installed"
-	fi
-done
-
-apt-get autoremove --yes || true
-
-# Removing unused files
-find . -name *~ | xargs rm -f
-
-rm -rf /usr/include/*
-rm -rf /usr/share/groff/*
-rm -rf /usr/share/doc/*
-rm -rf /usr/share/locale/*
-rm -rf /usr/share/man/*
-rm -rf /usr/share/i18n/*
-rm -rf /usr/share/info/*
-rm -rf /usr/share/lintian/*
-rm -rf /usr/share/linda/*
-rm -rf /usr/share/zoneinfo/*
-rm -rf /var/cache/man/*
-
-# Cleaning apt lists
-rm -rf /var/lib/apt/lists
-mkdir -p /var/lib/apt/lists/partial
-
-# Cleaning apt cache
-rm -rf /var/cache/apt
-mkdir -p /var/cache/apt/archives/partial
-
-# Truncating logs
-for FILE in $(find /var/log/ -type f)
-do
-	: > ${FILE}
-done
diff --git a/mini/config/chroot_local-hooks/xorg b/mini/config/chroot_local-hooks/xorg
deleted file mode 100755
index cb12fca..0000000
--- a/mini/config/chroot_local-hooks/xorg
+++ /dev/null
@@ -1,3 +0,0 @@
-echo Setting up Webconverger Xorg config
-rm /etc/X11/xorg.conf
-ln -s /etc/X11/xorg.webc.conf /etc/X11/xorg.conf
diff --git a/webconverger/config/chroot_local-includes/etc/apt/apt.conf b/webconverger/config/chroot_local-includes/etc/apt/apt.conf
new file mode 100644
index 0000000..ce20589
--- /dev/null
+++ b/webconverger/config/chroot_local-includes/etc/apt/apt.conf
@@ -0,0 +1 @@
+APT::Default-Release "testing";
diff --git a/webconverger/config/chroot_local-includes/etc/apt/preferences b/webconverger/config/chroot_local-includes/etc/apt/preferences
index f6ecef6..350785b 100644
--- a/webconverger/config/chroot_local-includes/etc/apt/preferences
+++ b/webconverger/config/chroot_local-includes/etc/apt/preferences
@@ -1,3 +1,8 @@
 Package: *
 Pin: release o=webconverger
 Pin-Priority: 1001
+
+Explanation: Sid
+Package: iceweasel
+Pin: release a=unstable
+Pin-Priority:1001
diff --git a/webconverger/config/chroot_sources/unstable.chroot b/webconverger/config/chroot_sources/unstable.chroot
new file mode 100644
index 0000000..f256e0a
--- /dev/null
+++ b/webconverger/config/chroot_sources/unstable.chroot
@@ -0,0 +1 @@
+#deb http://ftp.nl.debian.org/debian/ unstable main contrib non-free

-- 
debian-live/config-webc