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

Tue Apr 7 18:30:45 UTC 2009

The following commit has been merged in the master branch:
commit 6593f3eea25bf2987303d4cfbe2d3b5944502629
Author: Kai Hendry <hendry at iki.fi>
Date:   Tue Apr 7 20:34:14 2009 +0200

    Updated key. Have a odd problem with the grub package being missing now.

diff --git a/webconverger/config/chroot_local-hooks/zzzminimal b/webconverger/config/chroot_local-hooks/zzzminimal
index 5f15178..f110fa2 100755
--- a/webconverger/config/chroot_local-hooks/zzzminimal
+++ b/webconverger/config/chroot_local-hooks/zzzminimal
@@ -10,7 +10,7 @@
 set -e
 
 echo Removing unused packages
-for PACKAGE in apt-utils aptitude man-db manpages info libxapian15 grub grub-common vim-common vim-tiny \
+for PACKAGE in apt-utils aptitude man-db manpages info libxapian15 vim-common vim-tiny \
 	tcpd netcat-traditional gcc gcc-4.1 gcc-4.1-base gcc-4.2 gcc-4.2-base xserver-xorg-video-dummy ed dmidecode menu \
 	iptables rsyslog nano
 do
diff --git a/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js b/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js
new file mode 100644
index 0000000..9280bb0
--- /dev/null
+++ b/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js
@@ -0,0 +1,20 @@
+// This is the Debian specific preferences file for Iceweasel
+// You can make any change in here, it is the purpose of this file.
+// You can, with this file and all files present in the
+// /etc/iceweasel/pref directory, override any preference that is
+// present in /usr/lib/iceweasel/defaults/preferences directory.
+// While your changes will be kept on upgrade if you modify files in
+// /etc/iceweasel/pref, please note that they won't be kept if you
+// do make your changes in /usr/lib/iceweasel/defaults/preferences.
+//
+// Note that lockPref is allowed in these preferences files if you
+// don't want users to be able to override some preferences.
+
+pref("extensions.update.enabled", false);
+
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+pref("general.useragent.extra.firefox", "Firefox/2.0");
diff --git a/webconverger/config/chroot_sources/webc.binary.gpg b/webconverger/config/chroot_sources/webc.binary.gpg
index d44a589..ff87881 100644
--- a/webconverger/config/chroot_sources/webc.binary.gpg
+++ b/webconverger/config/chroot_sources/webc.binary.gpg
@@ -1,31 +1,31 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-mQGiBEXgdXkRBADtePLxYkxbqY1dUqHoWP7GnEUl/pni25nbuBwCn7jcBEIjcQ60
-ZkCML8MScIJ07SkNx69VOb1x9GHb00OY7r6mLLLe/wkP3kJEoLoKisu6TKdF8rUr
-Hx7mMHEhhTBvEhaNdh2UpQDcrDYIa42fRHIq/z1qhwTYdY8ngXcA2ZL41wCg5aRl
-bb2iZ6cc+LENhboUvgzNBGMD/2cDhrTFwe+0ww+9enGCy3WPD5hKBdEiCk+SAi7Q
-/K2n6ixf0xoHl0vC19xkAekXkvwHyexmpSI5hPxvH7AiC0+ylz3xr6+FhreZLfpV
-Jd5nO8nd2eDNgy6uEQrVgN5QOnPJrNH0Z4bETRU6PSkg9otGBx5kQm6TsDSkGWfS
-lHgrBADK/S39bHibCo1PBaQaRL4BjrRt6egGWv9EbNbFic+/yJ3t0VDPqsKVi+L2
-dA4QkTh0gV8ibVzztGRQEQUq/5q8nQyFSTjgnRMLBWNroXS5yuRrpHOp9H8I1tvn
-ZIJOCPXVkbsuMqyN3k26cnwpiiadvNS6R0hTfbLFJhxCgqB9d7RKV2ViY29udmVy
-Z2VyIEFyY2hpdmUgQXV0b21hdGljIFNpZ25pbmcgS2V5ICgyMDA3LzgpIDxrZXlA
-d2ViY29udmVyZ2VyLmNvbT6IZgQTEQIAJgUCReB1eQIbAwUJA8JnAAYLCQgHAwIE
-FQIIAwQWAgMBAh4BAheAAAoJEKMpE0mEwcygBggAn1IER8MQG68OwQg/eWc0g1Ox
-C7twAKCu4DwHA3YnJdY10c4NQM+FMzdeq7kCDQRF4HWTEAgAhn42eGmsY5qTweCZ
-qXxdm4ZdC+DFhpNo/399HJRMbU2j/dbPueOPHXCViWgo41IH9VIbUdB37gvAHjG3
-wxdU0krTYDnvKkBi6jovaGvoDCgMfMJniRy/qxHiJSUUwvg1npZ4g4U5qNEPsohC
-vCUh6cPA74UL2fb7thtWxOCBxlHTbH6UFznz/5xyKqzgmggOn9SXGTxLF+sbkpka
-jtgxzOdfj93fU4XQFvslZclGuz+Gshlh+5emMNbtYXmkJZK67mp9uIVI24hyXKOm
-HZl1FsIM73hQnhOtnKSABNbicAe+WOavlfq1/4NmK/kupAc7ySbyK3s7/IqYwARq
-5oYYSwADBgf/VPzBPURjVzBXPF4F/6ErfNvskxlEkkYppYoJhb7Yi9uq9n90AJgm
-iT2Bg3/05bTNrghk+aopyXRgbmww3BUhWIZwaxPlwaWhCePsWQaR+yuF4tHZBK4D
-RY2m+Blx3WIk4uWgz/n39UH/sN2TCu0CCmuP027KYij+YQJ75c4G2bAGAQtVVM3I
-sGiLoT/vDYkVvNoazpZmZFVGa7WdlTFOv3Fv8f6s7ay6vcCfByyD23ls3k/N3K1g
-SeGSIGViqXisxepIVtosGl6GT2D0gJB4Sm8pkJ0f9HOPXcFMzTHm7SKoveW7Jwbd
-31sDXKKTrVZhPyMmA7QLWE79H+EEbD8e/YhPBBgRAgAPBQJF4HWTAhsMBQkDwmcA
-AAoJEKMpE0mEwcygd/0An39rwO4A/xgtcp5DQOOlLOFqmHTYAKDMS8/XlLSJ4az9
-UhPwDRRKqYvYsg==
-=FxFx
+mQGiBEnbkDARBADu8hOpU5bTEWgHhDf6bg7D/+gEysuaN8cfuBtHwDpXHIa+Ppbx
+aAZUChl2M3LsTuRiEe7IbscOVqLtpCzityN0+GrtMtO30Fec8P8b1EAGj3pOdU61
+l9E/RjbqlmOaKbSixsWz8N599pqxpx2G8/pqKyrZu19D3fhNcOeQZfgyYwCgzt5W
+pKtgxh1HGa3C8jsx3n99cPcEALFrBdYJQjCBm4lT1F+mw+Qof+o44mji2qKNJnpN
+ElnjoVNPa4Rn25OqKcR51dC75qWUCBvf1XXu+/tlURGsEIlZ0CvSye6YVHuSamns
+DFzD0KUDRkrGKLRTRskoaf3vj3RHOvi7bRLPDKKLFDVc24ca0zt8ivNKH3JU0Hig
+o4fjA/9KjvyeyW70iToFhFst+WzqaY7IrqCXDCuYHfbpLhdgiSQ5uhQ2ZH2drJdS
+5G1sIAkN0OXQrQE1g+UcyCZv7Xao1F4oO+eoubpLhEuhDPJ5kYXRqKYu+VQ8uRyC
+ryknl1m1GcN9bKpPlRryCny3wNcBuiCeZIwju7BlVOzPMXan8LRBV2ViY29udmVy
+Z2VyIEFyY2hpdmUgQXV0b21hdGljIFNpZ25pbmcgS2V5IDxrZXlAd2ViY29udmVy
+Z2VyLmNvbT6IZgQTEQIAJgUCSduQMAIbAwUJA8JnAAYLCQgHAwIEFQIIAwQWAgMB
+Ah4BAheAAAoJEOPGWNZ+79jsk6AAnjXS7/uexlrKnz7z84VDt3DFSVZWAJ94lq/s
+P/s6Fqo3iVpms9UK5XuqVrkCDQRJ25AwEAgAkjUESIgcVOdcobvYhzEMptw5drhQ
+1xmFaqfWA7VXGWtmlUcMqyGKLlxJZo8TAS9btFbNkCdbiwmoxD4KiHKYmpipDYvF
+z3Z8DCNvtC3S3dN0WBrRDUzBVoL644gIAiAnY8zvyOWIlFc1X0tAN8KLmN+dwpDZ
+AkayzpFQ8oE/Lj+qGYCOEpANCEX3wjNgbP5p6Tuh1wUEGLOAgQqf15pc0AGGXSLc
+dIHEba/JG96s9jfxQ2iChybv383Xs6OjhGNgibwQyoeKLRjfY7KS8CLI/crC+zIu
+RBoJMw2NOKG8HqammY/PVg0iVKhpyBN7QSRR8HriKGhc07hJi0Eh5mmeSwADBQf/
+e3H/Z/tZs1F/5ldyKD07NiXltwceKUqYHDmKg2lEjcNQ8Wb1o0Dewrx+wNNTsYWm
+Kf4evsFjYU++CPWObo/ujbsNmFQW1A8OZyMuoz5sRyYfvDBhbCznSAObOhbt5OJo
+Ua8bQGxqOAX+9fnmW2F7a7BG6mjrc3yqVN5aEUmJKMl7fcHGvnsrp1bwJVLToi2h
+Yor3EZNP/6tpMNK3Aqp/eYA3O1yMHmN7iRkt8VpuaxQLsYEbufC+GVWz462gTDvz
+lIjDhIwcSChwyfr1lSopvrgfvahvMVEJuBjreM9b/MBVWyeC+6wJsDB03F0yeM/m
+CH/n5EpjqddLLUuExMS6cohPBBgRAgAPBQJJ25AwAhsMBQkDwmcAAAoJEOPGWNZ+
+79jssDQAn0BC7vHHK63NlcHPgFD3BR/Ly2L7AJ0ZgMNQeDrkW+Gsa0a7Aie1rU4C
+7w==
+=HzEj
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/webc.chroot.gpg b/webconverger/config/chroot_sources/webc.chroot.gpg
deleted file mode 100644
index d44a589..f8e25b7
--- a/webconverger/config/chroot_sources/webc.chroot.gpg
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEXgdXkRBADtePLxYkxbqY1dUqHoWP7GnEUl/pni25nbuBwCn7jcBEIjcQ60
-ZkCML8MScIJ07SkNx69VOb1x9GHb00OY7r6mLLLe/wkP3kJEoLoKisu6TKdF8rUr
-Hx7mMHEhhTBvEhaNdh2UpQDcrDYIa42fRHIq/z1qhwTYdY8ngXcA2ZL41wCg5aRl
-bb2iZ6cc+LENhboUvgzNBGMD/2cDhrTFwe+0ww+9enGCy3WPD5hKBdEiCk+SAi7Q
-/K2n6ixf0xoHl0vC19xkAekXkvwHyexmpSI5hPxvH7AiC0+ylz3xr6+FhreZLfpV
-Jd5nO8nd2eDNgy6uEQrVgN5QOnPJrNH0Z4bETRU6PSkg9otGBx5kQm6TsDSkGWfS
-lHgrBADK/S39bHibCo1PBaQaRL4BjrRt6egGWv9EbNbFic+/yJ3t0VDPqsKVi+L2
-dA4QkTh0gV8ibVzztGRQEQUq/5q8nQyFSTjgnRMLBWNroXS5yuRrpHOp9H8I1tvn
-ZIJOCPXVkbsuMqyN3k26cnwpiiadvNS6R0hTfbLFJhxCgqB9d7RKV2ViY29udmVy
-Z2VyIEFyY2hpdmUgQXV0b21hdGljIFNpZ25pbmcgS2V5ICgyMDA3LzgpIDxrZXlA
-d2ViY29udmVyZ2VyLmNvbT6IZgQTEQIAJgUCReB1eQIbAwUJA8JnAAYLCQgHAwIE
-FQIIAwQWAgMBAh4BAheAAAoJEKMpE0mEwcygBggAn1IER8MQG68OwQg/eWc0g1Ox
-C7twAKCu4DwHA3YnJdY10c4NQM+FMzdeq7kCDQRF4HWTEAgAhn42eGmsY5qTweCZ
-qXxdm4ZdC+DFhpNo/399HJRMbU2j/dbPueOPHXCViWgo41IH9VIbUdB37gvAHjG3
-wxdU0krTYDnvKkBi6jovaGvoDCgMfMJniRy/qxHiJSUUwvg1npZ4g4U5qNEPsohC
-vCUh6cPA74UL2fb7thtWxOCBxlHTbH6UFznz/5xyKqzgmggOn9SXGTxLF+sbkpka
-jtgxzOdfj93fU4XQFvslZclGuz+Gshlh+5emMNbtYXmkJZK67mp9uIVI24hyXKOm
-HZl1FsIM73hQnhOtnKSABNbicAe+WOavlfq1/4NmK/kupAc7ySbyK3s7/IqYwARq
-5oYYSwADBgf/VPzBPURjVzBXPF4F/6ErfNvskxlEkkYppYoJhb7Yi9uq9n90AJgm
-iT2Bg3/05bTNrghk+aopyXRgbmww3BUhWIZwaxPlwaWhCePsWQaR+yuF4tHZBK4D
-RY2m+Blx3WIk4uWgz/n39UH/sN2TCu0CCmuP027KYij+YQJ75c4G2bAGAQtVVM3I
-sGiLoT/vDYkVvNoazpZmZFVGa7WdlTFOv3Fv8f6s7ay6vcCfByyD23ls3k/N3K1g
-SeGSIGViqXisxepIVtosGl6GT2D0gJB4Sm8pkJ0f9HOPXcFMzTHm7SKoveW7Jwbd
-31sDXKKTrVZhPyMmA7QLWE79H+EEbD8e/YhPBBgRAgAPBQJF4HWTAhsMBQkDwmcA
-AAoJEKMpE0mEwcygd/0An39rwO4A/xgtcp5DQOOlLOFqmHTYAKDMS8/XlLSJ4az9
-UhPwDRRKqYvYsg==
-=FxFx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/webconverger/config/chroot_sources/webc.chroot.gpg b/webconverger/config/chroot_sources/webc.chroot.gpg
new file mode 120000
index d44a589..f8e25b7
--- /dev/null
+++ b/webconverger/config/chroot_sources/webc.chroot.gpg
@@ -0,0 +1 @@
+webc.binary.gpg
\ No newline at end of file

-- 
debian-live/config-webc

