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

[Kai Hendry]

The following commit has been merged in the master branch:
commit cd4015ee46ac9063f5dda4f2da9247d333c15533
Author: Kai Hendry <hendry at iki.fi>
Date:   Sat Nov 13 16:01:38 2010 +0100

    Put CJK mainline in order to make sure it all works in squeeze

diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/chinese b/webconverger/config/chroot_local-includes/etc/network/if-up.d/chinese
deleted file mode 100755
index 5b1fdc0..0000000
--- a/webconverger/config/chroot_local-includes/etc/network/if-up.d/chinese
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-grep -qs "locales=zh_CN.UTF-8" /proc/cmdline || exit 0
-NOTTY="-q -y -o DPkg::Options::=--force-confdef"
-DEBIAN_FRONTEND="noninteractive"
-export DEBIAN_FRONTEND
-PKGS="scim-chinese scim-tables-zh scim-uim xfonts-intl-chinese ttf-arphic-ukai ttf-arphic-uming xfonts-wqy iceweasel-l10n-zh-cn"
-logger "Setting up $0"
-sleep 5
-apt-get -q=2 update && apt-get ${NOTTY} install $PKGS
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/japanese b/webconverger/config/chroot_local-includes/etc/network/if-up.d/japanese
deleted file mode 100755
index e9a4fe2..0000000
--- a/webconverger/config/chroot_local-includes/etc/network/if-up.d/japanese
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-grep -qs "locales=ja_JP.UTF-8" /proc/cmdline || exit 0
-NOTTY="-q -y -o DPkg::Options::=--force-confdef"
-DEBIAN_FRONTEND="noninteractive"
-export DEBIAN_FRONTEND
-PKGS="ttf-vlgothic scim-anthy scim-uim scim-skk scim-prime scim-canna scim-tables-ja iceweasel-l10n-ja"
-logger "Setting up $0"
-sleep 5
-apt-get -q=2 update && apt-get ${NOTTY} install $PKGS
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/korean b/webconverger/config/chroot_local-includes/etc/network/if-up.d/korean
deleted file mode 100755
index 1fdf570..0000000
--- a/webconverger/config/chroot_local-includes/etc/network/if-up.d/korean
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-grep -qs "locales=ko_KR.UTF-8" /proc/cmdline || exit 0
-NOTTY="-q -y -o DPkg::Options::=--force-confdef"
-DEBIAN_FRONTEND="noninteractive"
-export DEBIAN_FRONTEND
-PKGS="scim-hangul scim-tables-ko scim-uim ttf-unfonts ttf-alee xfonts-baekmuk iceweasel-l10n-ko"
-logger "Setting up $0"
-sleep 5
-apt-get -q=2 update && apt-get ${NOTTY} install $PKGS
diff --git a/webconverger/config/chroot_local-packageslists/webconverger.list b/webconverger/config/chroot_local-packageslists/webconverger.list
index 45fb417..6f5363c 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger.list
+++ b/webconverger/config/chroot_local-packageslists/webconverger.list
@@ -122,3 +122,12 @@ myspell-sv-se
 myspell-sw
 myspell-th
 myspell-uk
+
+# Chinese
+scim-chinese scim-tables-zh scim-uim xfonts-intl-chinese ttf-arphic-ukai ttf-arphic-uming xfonts-wqy
+
+# Japanese
+ttf-vlgothic scim-anthy scim-uim scim-skk scim-prime scim-canna scim-tables-ja
+
+# Korean
+scim-hangul scim-tables-ko scim-uim ttf-unfonts ttf-alee xfonts-baekmuk

-- 
debian-live/config-webc