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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 022a550de558e9b5f22d38e11fa7106e42c6b88a
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun May 1 21:35:37 2011 +0200

    experimenting with artax

diff --git a/webconverger/auto/config b/webconverger/auto/config
index 2d0fd33..b33fea3 100755
--- a/webconverger/auto/config
+++ b/webconverger/auto/config
@@ -1,12 +1,11 @@
 #!/bin/sh
 
 #MIRROR_DEBIAN="ftp://mirror.hetzner.de/ftp.de.debian.org/debian/"
-MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
+#MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
 
 lb config noauto --clean \
 	--apt-recommends false \
 	--bootappend-live "homepage=http://portal.webconverger.com nonetworking nopersistent quickreboot nomodeset noroot splash" \
-	--cache-stages "bootstrap rootfs" \
 	-k 486 \
 	-a i386 \
 	-f standard \
@@ -16,14 +15,9 @@ lb config noauto --clean \
 	--hostname webconverger \
 	--bootloader syslinux \
 	--archive-areas "main contrib non-free" \
-	--distribution squeeze \
-	--iso-publisher "Webconverger; http://webconverger.com/; support at webconverger.com" \
-	--iso-volume "Webconverger $(date +%Y%m%d-%H:%M)" \
-	--memtest none \
-	--syslinux-splash config/binary_syslinux/splash.rle \
-	--syslinux-timeout 5 \
-	--mirror-bootstrap ${MIRROR_DEBIAN} \
-	--binary-indices false \
+	--mode progress --distribution artax \
+	--debian-installer false \
+	--apt-indices false \
 	--win32-loader false \
 	--source false \
 	-r 'unofficial.debian-maintainers.org live.debian.net' \
diff --git a/webconverger/config/chroot_apt/preferences b/webconverger/config/chroot_apt/preferences
index cb7b21f..a2fe7be 100644
--- a/webconverger/config/chroot_apt/preferences
+++ b/webconverger/config/chroot_apt/preferences
@@ -1,315 +1,3 @@
-Package: iceweasel
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-all
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-af
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ar
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-be
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-bg
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-bn-in
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ca
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-cs
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-cy
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-da
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-de
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-el
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-en-gb
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-eo
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-es-ar
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-es-es
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-et
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-eu
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fi
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fr
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fy-nl
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ga-ie
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-gl
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-gu-in
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-he
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-hi-in
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-hu
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-id
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-is
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-it
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ja
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ka
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-kn
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ko
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ku
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-lt
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-mk
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-mn
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-mr
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-nb-no
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-nl
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-nn-no
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-oc
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-pa-in
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-pl
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-pt-br
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-pt-pt
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ro
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ru
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-si
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-sk
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-sl
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-sq
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-sr
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-sv-se
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-te
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-th
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-tr
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-uk
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-zh-cn
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-zh-tw
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-as
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-bn-bd
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-es-cl
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-es-mx
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fa
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-hr
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-kk
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ml
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-or
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-rm
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ta-lk
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ta
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-vi
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-dz-bt
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fa-ir
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fur-it
-Pin: release n=artax-backports
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ne-np
+Package: *
 Pin: release n=artax-backports
 Pin-Priority: 999
diff --git a/webconverger/config/chroot_local-packagelists/webconverger.list b/webconverger/config/chroot_local-packagelists/webconverger.list
index 8051de9..1781a43 100644
--- a/webconverger/config/chroot_local-packagelists/webconverger.list
+++ b/webconverger/config/chroot_local-packagelists/webconverger.list
@@ -17,7 +17,7 @@ webconverger-archive-keyring
 
 # firefox
 iceweasel
-iceweasel-webconverger
+#iceweasel-webconverger
 openssl
 ca-certificates
 libcurl3
@@ -49,12 +49,6 @@ unclutter
 wpasupplicant
 wireless-tools
 
-firmware-bnx2
-firmware-iwlwifi
-firmware-qlogic
-firmware-ralink
-firmware-ipw2x00
-
 # printing
 cups
 
@@ -131,3 +125,5 @@ myspell-uk
 
 # Korean
 #scim-hangul scim-tables-ko scim-uim ttf-alee xfonts-baekmuk ttf-unfonts-core ttf-unfonts-extra
+#
+user-setup

-- 
debian-live/config-webc