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

Kai Hendry hendry at iki.fi
Sun Jun 7 18:58:18 UTC 2009 

The following commit has been merged in the master branch:
commit 7fd08ad67723a70032af6d33b09b208ebd1457e9
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Jun 7 21:05:45 2009 +0200

    ntpdate and acpi introduced

diff --git a/webconverger/config/chroot_local-hooks/madwifi.sh b/webconverger/config/chroot_local-hooks/madwifi.sh
deleted file mode 120000
index d4e0281..0000000
--- a/webconverger/config/chroot_local-hooks/madwifi.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/live-helper/examples/hooks/madwifi.sh
\ No newline at end of file
diff --git a/webconverger/config/chroot_local-packageslists/chinese b/webconverger/config/chroot_local-packageslists/chinese
deleted file mode 100644
index 184fe5f..0000000
--- a/webconverger/config/chroot_local-packageslists/chinese
+++ /dev/null
@@ -1,5 +0,0 @@
-scim-chinese scim-tables-zh scim-uim
-iceweasel-l10n-zh-cn
-xfonts-intl-chinese
-ttf-arphic-ukai ttf-arphic-uming
-xfonts-wqy
diff --git a/webconverger/config/chroot_local-packageslists/iceweasel-l10n b/webconverger/config/chroot_local-packageslists/iceweasel-l10n
deleted file mode 100644
index 61bf04d..0000000
--- a/webconverger/config/chroot_local-packageslists/iceweasel-l10n
+++ /dev/null
@@ -1,50 +0,0 @@
-#iceweasel-l10n-af - Afrikaans language package for Iceweasel
-#iceweasel-l10n-ar - Arabic language package for Iceweasel
-#iceweasel-l10n-be - Belarusian language package for Iceweasel
-#iceweasel-l10n-bg - Bulgarian language package for Iceweasel
-#iceweasel-l10n-ca - Catalan language package for Iceweasel
-#iceweasel-l10n-cs - Czech language package for Iceweasel
-#iceweasel-l10n-cy-gb - Welsh language package for Iceweasel
-#iceweasel-l10n-da - Danish language package for Iceweasel
-iceweasel-l10n-de
-#iceweasel-l10n-dz-bt - Dzongkha language package for Iceweasel
-#iceweasel-l10n-el - Greek language package for Iceweasel
-iceweasel-l10n-en-gb
-#iceweasel-l10n-es-ar - Spanish (Argentina) language package for Iceweasel
-iceweasel-l10n-es-es
-#iceweasel-l10n-et-ee - Estonian language package for Iceweasel
-#iceweasel-l10n-eu - Basque language package for Iceweasel
-#iceweasel-l10n-fa-ir - Persian language package for Iceweasel
-iceweasel-l10n-fi
-iceweasel-l10n-fr
-#iceweasel-l10n-fur-it - Furlan language package for Iceweasel
-#iceweasel-l10n-fy-nl - Frisian language package for Iceweasel
-#iceweasel-l10n-ga-ie - Irish (Ireland) language package for Iceweasel
-#iceweasel-l10n-gu-in - Gujarati (India) language package for Iceweasel
-#iceweasel-l10n-he - Hebrew language package for Iceweasel
-#iceweasel-l10n-hu - Hungarian language package for Iceweasel
-#iceweasel-l10n-it - Italian language package for Iceweasel
-iceweasel-l10n-ja
-#iceweasel-l10n-ka - Georgian language package for Iceweasel
-iceweasel-l10n-ko
-#iceweasel-l10n-ku - Kurdish language package for Iceweasel
-#iceweasel-l10n-lt - Lithuanian language package for Iceweasel
-#iceweasel-l10n-mk - Macedonian language package for Iceweasel
-#iceweasel-l10n-mn - Mongolian language package for Iceweasel
-#iceweasel-l10n-nb-no - Bokmaal (Norway) language package for Iceweasel
-#iceweasel-l10n-nl - Dutch language package for Iceweasel
-#iceweasel-l10n-nn-no - Nynorsk (Norway) language package for Iceweasel
-#iceweasel-l10n-pa-in - Punjabi (India) language package for Iceweasel
-#iceweasel-l10n-pl - Polish language package for Iceweasel
-#iceweasel-l10n-pt-br - Portuguese (Brazil) language package for Iceweasel
-#iceweasel-l10n-pt-pt - Portuguese (Portugal) language package for Iceweasel
-#iceweasel-l10n-ro - Romanian language package for Iceweasel
-#iceweasel-l10n-roa-es-val - Valencian (Spain) language package for Iceweasel
-#iceweasel-l10n-ru - Russian language package for Iceweasel
-#iceweasel-l10n-sk - Slovak language package for Iceweasel
-#iceweasel-l10n-sl - Slovenian language package for Iceweasel
-iceweasel-l10n-sv-se
-#iceweasel-l10n-tr - Turkish language package for Iceweasel
-#iceweasel-l10n-uk-ua - Ukrainian language package for Iceweasel
-iceweasel-l10n-zh-cn
-iceweasel-l10n-zh-tw
diff --git a/webconverger/config/chroot_local-packageslists/japanese b/webconverger/config/chroot_local-packageslists/japanese
deleted file mode 100644
index 99c4f39..0000000
--- a/webconverger/config/chroot_local-packageslists/japanese
+++ /dev/null
@@ -1,3 +0,0 @@
-iceweasel-l10n-ja
-ttf-vlgothic
-scim-anthy scim-uim scim-skk scim-prime scim-canna scim-tables-ja
diff --git a/webconverger/config/chroot_local-packageslists/korean b/webconverger/config/chroot_local-packageslists/korean
deleted file mode 100644
index e6ddaf9..0000000
--- a/webconverger/config/chroot_local-packageslists/korean
+++ /dev/null
@@ -1,5 +0,0 @@
-# For Korean locale support ko_KR.UTF-8
-scim-hangul scim-tables-ko scim-uim
-iceweasel-l10n-ko
-ttf-unfonts
-ttf-alee xfonts-baekmuk
diff --git a/webconverger/config/chroot_local-packageslists/myspell b/webconverger/config/chroot_local-packageslists/myspell
deleted file mode 100644
index c203fba..0000000
--- a/webconverger/config/chroot_local-packageslists/myspell
+++ /dev/null
@@ -1,33 +0,0 @@
-#myspell-bg
-myspell-ca
-myspell-cs-cz
-myspell-da
-myspell-de-de
-myspell-de-at
-myspell-de-ch
-myspell-el-gr
-myspell-en-us
-myspell-en-gb
-myspell-en-za
-myspell-es
-myspell-es
-myspell-fi
-myspell-fr
-#myspell-fr-gut
-myspell-he
-myspell-hu
-myspell-it
-myspell-ku
-myspell-lt
-#myspell-nb
-myspell-nl
-#myspell-nn
-myspell-pl
-myspell-pt
-myspell-pt-br
-myspell-pt-pt
-myspell-ru
-myspell-sk
-myspell-sl
-myspell-sv-se
-myspell-uk
diff --git a/webconverger/config/chroot_local-packageslists/printing b/webconverger/config/chroot_local-packageslists/printing
deleted file mode 100644
index 1c387cd..0000000
--- a/webconverger/config/chroot_local-packageslists/printing
+++ /dev/null
@@ -1,2 +0,0 @@
-# printing (disable otherwise SLOWWWWWWWWWWWW)
-cupsys
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index c21ee31..38adb2f 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -27,8 +27,7 @@ xloadimage
 ttf-dejavu
 
 # pdf
-# better printing dialog
-acroread
+xpdf
 # required for acroread
 debian-multimedia-keyring
 mozplugger
@@ -63,7 +62,7 @@ firmware-ipw2x00
 
 # printing
 cupsys
-#cups-client # this must be in to debug printing problems with `lpstat -p`
+# cups-client
 
 iceweasel-l10n-all
 
@@ -115,9 +114,12 @@ myspell-sw
 myspell-th
 myspell-uk
 
-# live-initscripts
+# firewall
 iptables
 
 # powering down
 acpid
 acpi-support-base
+
+# Getting the time right for certificate checks
+ntpdate
diff --git a/webconverger/menu.lst b/webconverger/menu.lst
deleted file mode 100644
index e1988a8..0000000
--- a/webconverger/menu.lst
+++ /dev/null
@@ -1,38 +0,0 @@
-default 1
-timeout     10
-color cyan/blue white/blue
-splashimage /boot/grub/splash.xpm.gz
-# sudo cp menu.lst binary/boot/grub/menu.lst && sudo rm .stage/binary_iso && sudo lh_binary_iso
-
-title		Live:
-root
-
-
-title		Debian GNU/Linux - live
-kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs
-initrd		/live/initrd.img-2.6.26-1-486
-
-title		Debian GNU/Linux - live for China
-kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://www.sina.com.cn nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=zh_CN.UTF-8 keyb=zh
-initrd		/live/initrd.img-2.6.26-1-486
-
-title		Debian GNU/Linux - live for Korea
-kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://www.naver.com/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=ko_KR.UTF-8
-initrd		/live/initrd.img-2.6.26-1-486
-
-title		Debian GNU/Linux - live for Japan
-kernel		/live/vmlinuz-2.6.26-1-486 boot=live quiet homepage=http://www.aplix.co.jp/ nosudo splash vga=791 username=webc hostname=webconverger union=aufs locale=ja_JP.UTF-8
-initrd		/live/initrd.img-2.6.26-1-486
-
-
-
-
-
-title		Install:
-root
-
-title		Install Webconverger
-kernel		/install/gtk/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 quiet auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- quiet
-initrd		/install/gtk/initrd.gz
-
-
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index a68deaa..0c4e4ae 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MIRROR_DEBIAN="http://mirror.webconverger.com/debian/"
+MIRROR_DEBIAN="http://ftp.de.debian.org/debian/"
 MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
 
 lh_config noautoconfig \
@@ -8,7 +8,7 @@ lh_config noautoconfig \
 	--bootappend-live "quiet homepage=http://portal.webconverger.com/ nonetworking nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent" \
 	--cache-stages "bootstrap rootfs" \
 	--debian-installer live \
-	--debian-installer-distribution lenny \
+	--debian-installer-distribution daily \
 	-k 486 \
 	-a i386 \
 	-f minimal \
@@ -32,4 +32,5 @@ lh_config noautoconfig \
 	--mirror-binary-security ${MIRROR_SECURITY} \
 	--binary-indices disabled \
 	--packages-lists "webconverger" \
+	--win32-loader disabled \
 	${@}

-- 
debian-live/config-webc

More information about the debian-live-changes mailing list