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

Kai Hendry hendry at iki.fi
Sun Apr 20 14:10:28 UTC 2008


The following commit has been merged in the master branch:
commit 10596e3b42cad2251cc5d554ba42e6ba8730156a
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Apr 20 15:06:41 2008 +0100

    Iceweasel 3 for Webc BETA 3.0

diff --git a/mini/config/binary b/mini/config/binary
index 42b5808..1df8dea 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -6,7 +6,7 @@
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-#LH_BINARY_IMAGES="usb-hdd"
+LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
@@ -14,7 +14,7 @@
 
 # $LH_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet iceweaselupgrade homepage=http://portal.webconverger.com/ nosudo"
+LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo acpi=off"
 
 # $LH_BOOTAPPEND_INSTALL: set boot parameters
 # (Default: empty)
@@ -22,7 +22,7 @@ LH_BOOTAPPEND_LIVE="quiet iceweaselupgrade homepage=http://portal.webconverger.c
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LH_BOOTLOADER="grub"
+#LH_BOOTLOADER="grub"
 
 # $LH_CHECKSUMS: set checksums
 # (Default: enabled)
diff --git a/mini/config/chroot_local-packages/dbus_1.2.1-1_i386.deb b/mini/config/chroot_local-packages/dbus_1.2.1-1_i386.deb
new file mode 100644
index 0000000..8def54a
Binary files /dev/null and b/mini/config/chroot_local-packages/dbus_1.2.1-1_i386.deb differ
diff --git a/mini/config/chroot_local-packages/dwm_4.9-1_i386.deb b/mini/config/chroot_local-packages/dwm_4.9-1_i386.deb
new file mode 100644
index 0000000..53f18c4
Binary files /dev/null and b/mini/config/chroot_local-packages/dwm_4.9-1_i386.deb differ
diff --git a/mini/config/chroot_local-packages/iceweasel-gnome-support_3.0~b5-1_i386.deb b/mini/config/chroot_local-packages/iceweasel-gnome-support_3.0~b5-1_i386.deb
new file mode 100644
index 0000000..adb27f4
Binary files /dev/null and b/mini/config/chroot_local-packages/iceweasel-gnome-support_3.0~b5-1_i386.deb differ
diff --git a/mini/config/chroot_local-packages/iceweasel-webconverger_6-24_all.deb b/mini/config/chroot_local-packages/iceweasel-webconverger_6-24_all.deb
new file mode 100644
index 0000000..86b56c1
Binary files /dev/null and b/mini/config/chroot_local-packages/iceweasel-webconverger_6-24_all.deb differ
diff --git a/mini/config/chroot_local-packages/iceweasel_3.0~b5-1_i386.deb b/mini/config/chroot_local-packages/iceweasel_3.0~b5-1_i386.deb
new file mode 100644
index 0000000..5f3f89b
Binary files /dev/null and b/mini/config/chroot_local-packages/iceweasel_3.0~b5-1_i386.deb differ
diff --git a/mini/config/chroot_local-packages/libcairo2_1.6.4-1_i386.deb b/mini/config/chroot_local-packages/libcairo2_1.6.4-1_i386.deb
new file mode 100644
index 0000000..7a259f6
Binary files /dev/null and b/mini/config/chroot_local-packages/libcairo2_1.6.4-1_i386.deb differ
diff --git a/mini/config/chroot_local-packages/libdbus-1-3_1.2.1-1_i386.deb b/mini/config/chroot_local-packages/libdbus-1-3_1.2.1-1_i386.deb
new file mode 100644
index 0000000..ca05644
Binary files /dev/null and b/mini/config/chroot_local-packages/libdbus-1-3_1.2.1-1_i386.deb differ
diff --git a/mini/config/chroot_local-packages/libdbus-glib-1-2_0.74-2_i386.deb b/mini/config/chroot_local-packages/libdbus-glib-1-2_0.74-2_i386.deb
new file mode 100644
index 0000000..fa1c663
Binary files /dev/null and b/mini/config/chroot_local-packages/libdbus-glib-1-2_0.74-2_i386.deb differ
diff --git a/mini/config/chroot_local-packages/libpixman-1-0_0.10.0-2_i386.deb b/mini/config/chroot_local-packages/libpixman-1-0_0.10.0-2_i386.deb
new file mode 100644
index 0000000..0f88608
Binary files /dev/null and b/mini/config/chroot_local-packages/libpixman-1-0_0.10.0-2_i386.deb differ
diff --git a/webconverger/config/chroot b/webconverger/config/chroot
index 76834e0..d4cd115 100644
--- a/webconverger/config/chroot
+++ b/webconverger/config/chroot
@@ -2,7 +2,7 @@
 
 # $LH_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LH_CHROOT_FILESYSTEM="squashfs"
+#LH_CHROOT_FILESYSTEM="plain"
 
 # $LH_UNION_FILESYSTEM: set union filesystem
 # (Default: aufs)
@@ -34,7 +34,7 @@ LH_UNION_FILESYSTEM="aufs"
 
 # $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6 squashfs-modules-2.6"
+LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6 squashfs-modules-2.6 lzma-modules-2.6"
 
 # $LH_PACKAGES: set packages to install
 # (Default: empty)
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index 8337826..0fd8f3d 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -25,13 +25,13 @@ dwm
 xloadimage
 
 # browser
-iceweasel
+#iceweasel
 
 # For reseting the kiosk
 xautolock
 
 # For locking down the browser
-iceweasel-webconverger
+#iceweasel-webconverger
 
 # fonts
 ttf-dejavu
diff --git a/webconverger/config/chroot_sources/squashfs-antifuckup.binary b/webconverger/config/chroot_sources/squashfs-antifuckup.binary
deleted file mode 100644
index c0b70ea..0000000
--- a/webconverger/config/chroot_sources/squashfs-antifuckup.binary
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://live.debian.net/squashfs-antifuckup/lenny/ ./
-deb-src http://live.debian.net/squashfs-antifuckup/lenny/ ./
diff --git a/webconverger/config/chroot_sources/squashfs-antifuckup.binary.gpg b/webconverger/config/chroot_sources/squashfs-antifuckup.binary.gpg
deleted file mode 100644
index d4cc18c..0000000
--- a/webconverger/config/chroot_sources/squashfs-antifuckup.binary.gpg
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEd7qZgRBAC3GlfYpbpKwxb1D7wKRymb8TV9bt97G/hTfCpjlU1k8KAbdZf/
-Sq0XtsS3nMePn1ex2IfkfwEKv/FTsO4zb/vmKVwbCjXmpepFGbEJ+8yD+JT6aLH9
-MmSuhuWHmXfD9KHXEfvViY93OqxmlF19TDhSS32GYdz4jTtAyos8YOLoGwCgxv6j
-iZLDC2akbtmG7YY924DAOEED/3zsMWC/CxQo0X4gDXA1UkRq7D5I7xnHrEcpe3U/
-+md5mrtfZonaL+JVymao9qNqe3wNQYRc3/ahi4UNoL0JRv5VzoC16ncAQiLJaipz
-ccaU/zH4SIm7Md53Dln+Wgtj0cB5VeXWdPFJfIGEUZYE3adtav+g1OmsYsqsyncW
-alP9A/90eUXZN0zoq4RWAMS4Pk9BgSQVL7IFebq1Ovmp+LAo/VZccoKuvRCCPkTN
-rn9EhORJrx99Ip+wL7gdT0APr3+YbBXdiQjROBIioW9PUxqV3EcUn6A1hh+K+cl3
-aAyedeZ51+YstBDg1y8GGIVe1U3C+NcIIkUDLnbr6TgbxMyyqbRYRGViaWFuIFVu
-b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDgpIDxm
-dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJHe6mZAhsD
-BQkCChIABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc2v/B/2405rBZwCgnDBh
-P7wKQLv9AJNUuoXwMBjd+bEAn01AVXyMUI2/CvvsrmL1vHXs352iuQINBEd7qbUQ
-CADErp0VK76K6vh1+k8hiZakbpBSsOV7pSmiWHQK6yI5ZdHAOMlGe+APD6+TQ7Bj
-yJniSlHR8w0Fpws7NEzkAZkq1Dz6wwrqcRFWH155TrHPJe+LiJOM9xtq6EMjPAUS
-Mm44ntN9Z87yO6qmG81f/hrQXCZgiHXUCHnY5PaQ3wTviOdFng1lPbusG5DvXPPG
-SVUeKJyy3yuFnRNuxcrcRpmVN+TXB+jTDVKXxfaXM9Ix9UvLIFV/V56lVRJ9qDUw
-0bGf8Qo71bazHSGVHRdxuhzCMdvRknsoYfpDA9jpYPCLnOER3yT9Q81UQPNSH4pQ
-USOR0XoKg7hXcajLX9QKjNL3AAQNCADD2w+081KUT1EsnrqKkdYS9Ip8weJKRohq
-xFc696dYYTqKU1jAr4exECslrEBvUPfMqF+9sjA4iMHnjbTSSel+b29mXeVXTpvf
-DMueeJLb+4OnXRgThhfJ/BBwTVrxNdxtdbqF8bLvEFGgf+XLcm6ikXmxMbUj+V2u
-dVa+h6XlfyAS91GeCuUXsk6338QtBVxlaP/RXzIrfnQ/xJEjON/950DlsAlS0jxI
-mWsWhYXp6/ggGq8/2p9h/9CXALCSxUiOpzMBCzKtKg3o9uK+p2jWEIv2MjxFHhpV
-WfGUYrNpIt4qBAU9wPp1zSHw2hFhb2KPkUJSvf+SOn548pOJxiyTiE8EGBECAA8F
-Akd7qbUCGwwFCQIKEgAACgkQc2v/B/2405o+DwCgxpzJdJNQXxckpxJ2tmIaUqsY
-adgAnj/MyOnOtFiVmrUbcgnUcSNPQtV3
-=xI0k
------END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/squashfs-antifuckup.chroot b/webconverger/config/chroot_sources/squashfs-antifuckup.chroot
deleted file mode 100644
index c0b70ea..0000000
--- a/webconverger/config/chroot_sources/squashfs-antifuckup.chroot
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://live.debian.net/squashfs-antifuckup/lenny/ ./
-deb-src http://live.debian.net/squashfs-antifuckup/lenny/ ./
diff --git a/webconverger/config/chroot_sources/squashfs-antifuckup.chroot.gpg b/webconverger/config/chroot_sources/squashfs-antifuckup.chroot.gpg
deleted file mode 100644
index d4cc18c..0000000
--- a/webconverger/config/chroot_sources/squashfs-antifuckup.chroot.gpg
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEd7qZgRBAC3GlfYpbpKwxb1D7wKRymb8TV9bt97G/hTfCpjlU1k8KAbdZf/
-Sq0XtsS3nMePn1ex2IfkfwEKv/FTsO4zb/vmKVwbCjXmpepFGbEJ+8yD+JT6aLH9
-MmSuhuWHmXfD9KHXEfvViY93OqxmlF19TDhSS32GYdz4jTtAyos8YOLoGwCgxv6j
-iZLDC2akbtmG7YY924DAOEED/3zsMWC/CxQo0X4gDXA1UkRq7D5I7xnHrEcpe3U/
-+md5mrtfZonaL+JVymao9qNqe3wNQYRc3/ahi4UNoL0JRv5VzoC16ncAQiLJaipz
-ccaU/zH4SIm7Md53Dln+Wgtj0cB5VeXWdPFJfIGEUZYE3adtav+g1OmsYsqsyncW
-alP9A/90eUXZN0zoq4RWAMS4Pk9BgSQVL7IFebq1Ovmp+LAo/VZccoKuvRCCPkTN
-rn9EhORJrx99Ip+wL7gdT0APr3+YbBXdiQjROBIioW9PUxqV3EcUn6A1hh+K+cl3
-aAyedeZ51+YstBDg1y8GGIVe1U3C+NcIIkUDLnbr6TgbxMyyqbRYRGViaWFuIFVu
-b2ZmaWNpYWwgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMDgpIDxm
-dHBtYXN0ZXJAZGViaWFuLXVub2ZmaWNpYWwub3JnPohmBBMRAgAmBQJHe6mZAhsD
-BQkCChIABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc2v/B/2405rBZwCgnDBh
-P7wKQLv9AJNUuoXwMBjd+bEAn01AVXyMUI2/CvvsrmL1vHXs352iuQINBEd7qbUQ
-CADErp0VK76K6vh1+k8hiZakbpBSsOV7pSmiWHQK6yI5ZdHAOMlGe+APD6+TQ7Bj
-yJniSlHR8w0Fpws7NEzkAZkq1Dz6wwrqcRFWH155TrHPJe+LiJOM9xtq6EMjPAUS
-Mm44ntN9Z87yO6qmG81f/hrQXCZgiHXUCHnY5PaQ3wTviOdFng1lPbusG5DvXPPG
-SVUeKJyy3yuFnRNuxcrcRpmVN+TXB+jTDVKXxfaXM9Ix9UvLIFV/V56lVRJ9qDUw
-0bGf8Qo71bazHSGVHRdxuhzCMdvRknsoYfpDA9jpYPCLnOER3yT9Q81UQPNSH4pQ
-USOR0XoKg7hXcajLX9QKjNL3AAQNCADD2w+081KUT1EsnrqKkdYS9Ip8weJKRohq
-xFc696dYYTqKU1jAr4exECslrEBvUPfMqF+9sjA4iMHnjbTSSel+b29mXeVXTpvf
-DMueeJLb+4OnXRgThhfJ/BBwTVrxNdxtdbqF8bLvEFGgf+XLcm6ikXmxMbUj+V2u
-dVa+h6XlfyAS91GeCuUXsk6338QtBVxlaP/RXzIrfnQ/xJEjON/950DlsAlS0jxI
-mWsWhYXp6/ggGq8/2p9h/9CXALCSxUiOpzMBCzKtKg3o9uK+p2jWEIv2MjxFHhpV
-WfGUYrNpIt4qBAU9wPp1zSHw2hFhb2KPkUJSvf+SOn548pOJxiyTiE8EGBECAA8F
-Akd7qbUCGwwFCQIKEgAACgkQc2v/B/2405o+DwCgxpzJdJNQXxckpxJ2tmIaUqsY
-adgAnj/MyOnOtFiVmrUbcgnUcSNPQtV3
-=xI0k
------END PGP PUBLIC KEY BLOCK-----

-- 
debian-live/config-webc



More information about the debian-live-changes mailing list