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

Kai Hendry hendry at iki.fi
Tue Jun 24 21:58:48 UTC 2008


The following commit has been merged in the master branch:
commit 58a6c5edd8129e37a85289b99094154fc55807bd
Author: Kai Hendry <hendry at iki.fi>
Date:   Tue Jun 24 22:32:05 2008 +0100

    webkit!

diff --git a/mini/config/binary b/mini/config/binary
index 8e1e3f1..cd2df25 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"
+LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com nosudo splash vga=791 kioskresetstation=2"
 
 # $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
index 90cfa98..36a5b54 100755
--- a/mini/config/chroot_local-hooks/stripped
+++ b/mini/config/chroot_local-hooks/stripped
@@ -13,6 +13,7 @@ set -e
 # 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 \
diff --git a/webconverger/config/bootstrap b/webconverger/config/bootstrap
index daef2aa..7d9e1ce 100644
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@ -26,7 +26,7 @@
 
 # $LH_DISTRIBUTION: select distribution to use
 # (Default: lenny)
-LH_DISTRIBUTION="sid"
+#LH_DISTRIBUTION="sid"
 
 # $LH_MIRROR_BOOTSTRAP: set mirror to boostrap from
 # (Default: http://ftp.us.debian.org/debian/)
diff --git a/webconverger/config/chroot_local-packageslists/content-filter b/webconverger/config/chroot_local-packageslists/content-filter
deleted file mode 100644
index a5de090..0000000
--- a/webconverger/config/chroot_local-packageslists/content-filter
+++ /dev/null
@@ -1,2 +0,0 @@
-# For pornography filter
-# iceweasel-procon
diff --git a/webconverger/config/chroot_local-packageslists/tor b/webconverger/config/chroot_local-packageslists/tor
deleted file mode 100644
index 8ffa2c1..0000000
--- a/webconverger/config/chroot_local-packageslists/tor
+++ /dev/null
@@ -1,3 +0,0 @@
-#iceweasel-torbutton
-#tor
-#privoxy
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index f381167..56c01f2 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -23,9 +23,6 @@ dwm
 # For the background
 xloadimage
 
-# browser
-iceweasel
-
 # For reseting the kiosk
 xautolock
 
@@ -34,7 +31,7 @@ ttf-dejavu
 ttf-gentium
 
 # pdf
-xpdf mozplugger
+# xpdf mozplugger
 
 # bootscreen
 splashy
diff --git a/mini/config/binary b/webkit/config/binary
similarity index 97%
copy from mini/config/binary
copy to webkit/config/binary
index 8e1e3f1..cd2df25 100644
--- a/mini/config/binary
+++ b/webkit/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"
+LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com nosudo splash vga=791 kioskresetstation=2"
 
 # $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/binary_debian-installer b/webkit/config/binary_debian-installer
similarity index 100%
copy from mini/config/binary_debian-installer
copy to webkit/config/binary_debian-installer
diff --git a/mini/config/binary_grub b/webkit/config/binary_grub
similarity index 100%
copy from mini/config/binary_grub
copy to webkit/config/binary_grub
diff --git a/mini/config/binary_local-includes b/webkit/config/binary_local-includes
similarity index 100%
copy from mini/config/binary_local-includes
copy to webkit/config/binary_local-includes
diff --git a/mini/config/binary_syslinux b/webkit/config/binary_syslinux
similarity index 100%
copy from mini/config/binary_syslinux
copy to webkit/config/binary_syslinux
diff --git a/mini/config/bootstrap b/webkit/config/bootstrap
similarity index 100%
copy from mini/config/bootstrap
copy to webkit/config/bootstrap
diff --git a/mini/config/chroot b/webkit/config/chroot
similarity index 100%
copy from mini/config/chroot
copy to webkit/config/chroot
diff --git a/mini/config/chroot_local-hooks/stripped b/webkit/config/chroot_local-hooks/stripped
similarity index 97%
copy from mini/config/chroot_local-hooks/stripped
copy to webkit/config/chroot_local-hooks/stripped
index 90cfa98..b38b301 100755
--- a/mini/config/chroot_local-hooks/stripped
+++ b/webkit/config/chroot_local-hooks/stripped
@@ -13,6 +13,10 @@ set -e
 # python-2.5
 # Rip out X extensions
 for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute \
+vim-tiny vim-common \
+netcat-traditional \
+dbus \
+perl-doc \
 gcc-4.2-base \
 gcc-4.3-base \
 xserver-xorg-input-synaptics \
diff --git a/mini/config/chroot_local-hooks/theme b/webkit/config/chroot_local-hooks/theme
similarity index 100%
copy from mini/config/chroot_local-hooks/theme
copy to webkit/config/chroot_local-hooks/theme
diff --git a/mini/config/chroot_local-hooks/webconverger b/webkit/config/chroot_local-hooks/webconverger
similarity index 100%
copy from mini/config/chroot_local-hooks/webconverger
copy to webkit/config/chroot_local-hooks/webconverger
diff --git a/mini/config/chroot_local-hooks/xorg b/webkit/config/chroot_local-hooks/xorg
similarity index 100%
copy from mini/config/chroot_local-hooks/xorg
copy to webkit/config/chroot_local-hooks/xorg
diff --git a/mini/config/chroot_local-includes b/webkit/config/chroot_local-includes
similarity index 100%
copy from mini/config/chroot_local-includes
copy to webkit/config/chroot_local-includes
diff --git a/webkit/config/chroot_local-packages/libwebkit-1.0-1_0~svn33561-1.1_i386.deb b/webkit/config/chroot_local-packages/libwebkit-1.0-1_0~svn33561-1.1_i386.deb
new file mode 100644
index 0000000..4fdd13b
Binary files /dev/null and b/webkit/config/chroot_local-packages/libwebkit-1.0-1_0~svn33561-1.1_i386.deb differ
diff --git a/mini/config/chroot_local-packageslists/webconverger b/webkit/config/chroot_local-packageslists/webconverger
similarity index 100%
copy from mini/config/chroot_local-packageslists/webconverger
copy to webkit/config/chroot_local-packageslists/webconverger
diff --git a/webkit/config/chroot_local-packageslists/webkit b/webkit/config/chroot_local-packageslists/webkit
new file mode 100644
index 0000000..a6b63ee
--- /dev/null
+++ b/webkit/config/chroot_local-packageslists/webkit
@@ -0,0 +1 @@
+#epiphany-webkit
diff --git a/mini/config/chroot_sources b/webkit/config/chroot_sources
similarity index 100%
copy from mini/config/chroot_sources
copy to webkit/config/chroot_sources
diff --git a/mini/config/common b/webkit/config/common
similarity index 100%
copy from mini/config/common
copy to webkit/config/common
diff --git a/mini/config/source b/webkit/config/source
similarity index 100%
copy from mini/config/source
copy to webkit/config/source

-- 
debian-live/config-webc



More information about the debian-live-changes mailing list