[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-8-gcc833d0

Ben Armstrong synrg at debian.org
Sat May 9 22:47:53 UTC 2009


The following commit has been merged in the master branch:
commit cc833d0c8587a4d8d35d7b2c75509d6d3df5755e
Author: Ben Armstrong <synrg at debian.org>
Date:   Sat May 9 19:47:41 2009 -0300

    Expand package list, trim image size, make UsersGuide iceweasel homepage instead of autostart

diff --git a/Changelog b/Changelog
index 5e3c57c..1832a6a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,15 +1,23 @@
 1.0~b2
 ------
- * Add acpi, cpufrequtils.
- * Add misc useful utilities: gparted, netcat.
+ * Add acpi, cpufrequtils, libgl1-mesa-dri.
+ * Add misc useful utilities & apps: gparted, netcat,
+   iputils-ping, less, ssh-client, amsn, pidgin,
+   clive, rsync, nano, vim-tiny, bash-completion,
+   rsync, vim-tiny.
+ * Add a smallish but fun game: briquolo.
  * Ensure synaptic and wget don't get removed by the
    minimal hook.
  * Disable xscreensaver lock on suspend and remove it from the
    panel, as user will likely not know the password.
  * Decrease lxterminal font one point-size so that on model 701
    the terminal will fit the display without being resized.
- * Autostart iceweasel on a copy of:
+ * Make iceweasel home page be a copy of
    http://wiki.debian.org/DebianEeePC/Live/UsersGuide.html
+   which is now downloaded by the eeepc.sh hook.
+ * Drop contrib, non-free.
+ * Omit binary apt indices, as this setting works against the
+   stripped hook which removes them.
 
 1.0~b1
 ------
diff --git a/config/binary b/config/binary
index d3f692a..a23cbc1 100644
--- a/config/binary
+++ b/config/binary
@@ -10,7 +10,7 @@ LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
-LH_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="none"
 
 # $LH_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
diff --git a/config/bootstrap b/config/bootstrap
index e0dea78..61126bc 100644
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -50,4 +50,4 @@ LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
 # $LH_CATEGORIES: select categories to use
 # (Default: main contrib)
-LH_CATEGORIES="main contrib"
+LH_CATEGORIES="main"
diff --git a/config/chroot_local-hooks/eeepc.sh b/config/chroot_local-hooks/eeepc.sh
index cc8118d..1409379 100755
--- a/config/chroot_local-hooks/eeepc.sh
+++ b/config/chroot_local-hooks/eeepc.sh
@@ -7,3 +7,7 @@ echo "HWCLOCKPARS=--directisa" >> /etc/default/rcS
 SCRIPTS_DEFAULTS=/etc/default/eeepc-acpi-scripts
 sed -i "s/ENABLE_OSD='no'/ENABLE_OSD='yes'/" $SCRIPTS_DEFAULTS
 sed -i "s/LOCK_SCREEN_ON_SUSPEND='yes'/LOCK_SCREEN_ON_SUSPEND='no'/" $SCRIPTS_DEFAULTS
+mkdir -p /usr/local/share/eeepc-live
+(cd /usr/local/share/eeepc-live ;
+ wget -E -H -k -K -p http://wiki.debian.org/DebianEeePC/Live/UsersGuide ;
+ ln -s wiki.debian.org/DebianEeePC/Live/UsersGuide.html)
diff --git a/config/chroot_local-includes/etc/iceweasel/profile/localstore.rdf b/config/chroot_local-includes/etc/iceweasel/profile/localstore.rdf
new file mode 100644
index 0000000..e5d45fb
--- /dev/null
+++ b/config/chroot_local-includes/etc/iceweasel/profile/localstore.rdf
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#toggle_taskbar"
+                   checked="false" />
+  <RDF:Description RDF:about="chrome://global/content/customizeToolbar.xul#CustomizeToolbarWindow"
+                   width="636"
+                   height="400" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#status-bar"
+                   hidden="true" />
+  <RDF:Description RDF:about="chrome://global/content/customizeToolbar.xul">
+    <NC:persist RDF:resource="chrome://global/content/customizeToolbar.xul#CustomizeToolbarWindow"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-title"
+                   value="" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#main-window"
+                   width="994"
+                   height="960"
+                   sizemode="normal"
+                   screenX="16"
+                   screenY="7" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#toolbar-menubar"
+                   currentset="menubar-items,urlbar-container,stop-button,throbber-box"
+                   iconsize="small" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#navigator-toolbox"
+                   iconsize="small" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#PersonalToolbar"
+                   currentset="personal-bookmarks"
+                   collapsed="true"
+                   iconsize="small" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul">
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#main-window"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-box"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-title"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#status-bar"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#toggle_taskbar"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#toolbar-menubar"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#nav-bar"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#PersonalToolbar"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#navigator-toolbox"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#nav-bar"
+                   currentset="__empty"
+                   collapsed="true"
+                   iconsize="small" />
+</RDF:RDF>
diff --git a/config/chroot_local-includes/etc/iceweasel/profile/prefs.js b/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
new file mode 100644
index 0000000..a459395
--- /dev/null
+++ b/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
@@ -0,0 +1,11 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the browser is running,
+ * the changes will be overwritten when the browser exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+user_pref("browser.startup.homepage", "file:///usr/local/share/eeepc-live/UsersGuide.html");
diff --git a/config/chroot_local-includes/etc/skel/.config/lxsession/LXDE/autostart b/config/chroot_local-includes/etc/skel/.config/lxsession/LXDE/autostart
deleted file mode 100644
index d1ab371..0000000
--- a/config/chroot_local-includes/etc/skel/.config/lxsession/LXDE/autostart
+++ /dev/null
@@ -1,5 +0,0 @@
- at lxde-settings
- at xscreensaver -no-splash
- at lxpanel --profile LXDE
- at pcmanfm -d
- at iceweasel file:///home/user/Desktop/UsersGuide.html
diff --git a/config/chroot_local-includes/etc/skel/Desktop/UsersGuide.html b/config/chroot_local-includes/etc/skel/Desktop/UsersGuide.html
deleted file mode 100644
index cfd3b91..0000000
--- a/config/chroot_local-includes/etc/skel/Desktop/UsersGuide.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<link rel="shortcut icon" href="/htdocs/favicon.ico">
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-<meta name="robots" content="index,nofollow">
-
-<title>DebianEeePC/Live/UsersGuide - Debian Wiki</title>
-<script type="text/javascript" src="/htdocs/common/js/common.js"></script>
-
-<script type="text/javascript">
-<!--
-var search_hint = "Search";
-//-->
-</script>
-
-
-<link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="/htdocs/modern/css/common.css">
-<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="/htdocs/modern/css/screen.css">
-<link rel="stylesheet" type="text/css" charset="utf-8" media="print" href="/htdocs/modern/css/print.css">
-<link rel="stylesheet" type="text/css" charset="utf-8" media="projection" href="/htdocs/modern/css/projection.css">
-<link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="/htdocs/debian-wiki-1.0.css">
-
-<!-- css only for MSIE browsers -->
-<!--[if IE]>
-   <link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="/htdocs/modern/css/msie.css">
-<![endif]-->
-
-
-
-
-<link rel="Start" href="/FrontPage">
-<link rel="Alternate" title="Wiki Markup" href="/DebianEeePC/Live/UsersGuide?action=raw">
-<link rel="Alternate" media="print" title="Print View" href="/DebianEeePC/Live/UsersGuide?action=print">
-<link rel="Up" href="/DebianEeePC/Live">
-<link rel="Search" href="/FindPage">
-<link rel="Index" href="/TitleIndex">
-<link rel="Glossary" href="/WordIndex">
-<link rel="Help" href="/HelpOnFormatting">
-</head>
-
-<body  lang="en" dir="ltr">
-
-<div id="header">
-<div id="logo"><a href="/FrontPage"><a href="http://wiki.debian.org/"><img src="/htdocs/WikiDebianLogo_B.png" alt="Debian wiki"></a></a></div>
-
-<form id="searchform" method="get" action="/DebianEeePC/Live/UsersGuide">
-<div>
-<input type="hidden" name="action" value="fullsearch">
-<input type="hidden" name="context" value="180">
-<label for="searchinput">Search:</label>
-<input id="searchinput" type="text" name="value" value="" size="20"
-    onfocus="searchFocus(this)" onblur="searchBlur(this)"
-    onkeyup="searchChange(this)" onchange="searchChange(this)" alt="Search">
-<input id="titlesearch" name="titlesearch" type="submit"
-    value="Titles" alt="Search Titles">
-<input id="fullsearch" name="fullsearch" type="submit"
-    value="Text" alt="Search Full Text">
-</div>
-</form>
-<script type="text/javascript">
-<!--// Initialize search form
-var f = document.getElementById('searchform');
-f.getElementsByTagName('label')[0].style.display = 'none';
-var e = document.getElementById('searchinput');
-searchChange(e);
-searchBlur(e);
-//-->
-</script>
-
-<ul id="username"><li><a href="/DebianEeePC/Live/UsersGuide?action=login" id="login" rel="nofollow">Login</a></li></ul>
-<div id="locationline">
-
-
-<ul id="pagelocation">
-<li><a href="/DebianEeePC">DebianEeePC</a></li><li><a href="/DebianEeePC/Live">Live</a></li><li><a class="backlink" href="/DebianEeePC/Live/UsersGuide?action=fullsearch&amp;context=180&amp;value=linkto%3A%22DebianEeePC/Live/UsersGuide%22" rel="nofollow" title="Click to do a full-text search for this title">UsersGuide</a></li>
-</ul>
-
-</div>
-
-
-<ul id="navibar">
-<li class="wikilink"><a href="/FrontPage">FrontPage</a></li><li class="wikilink"><a href="/RecentChanges">RecentChanges</a></li><li class="wikilink"><a href="/FindPage">FindPage</a></li><li class="wikilink"><a href="/HelpContents">HelpContents</a></li><li class="current"><a href="/DebianEeePC/Live/UsersGuide">UsersGuide</a></li>
-</ul>
-
-<div id="pageline"><hr style="display:none;"></div>
-
-<ul class="editbar"><li><span class="disabled">Immutable Page</span></li><li><a href="#" class="toggleCommentsButton" style="display:none;" onClick="toggleComments();return false;">Comments</a></li><li><a class="nbinfo" href="/DebianEeePC/Live/UsersGuide?action=info" rel="nofollow">Info</a></li><li><a class="nbattachments" href="/DebianEeePC/Live/UsersGuide?action=AttachFile" rel="nofollow">Attachments</a></li><li>
-<form class="actionsmenu" method="GET" action="/DebianEeePC/Live/UsersGuide">
-<div>
-    <label>More Actions:</label>
-    <select name="action"
-        onchange="if ((this.selectedIndex != 0) &&
-                      (this.options[this.selectedIndex].disabled == false)) {
-                this.form.submit();
-            }
-            this.selectedIndex = 0;">
-        <option value="raw">Raw Text</option>
-<option value="print">Print View</option>
-<option value="RenderAsDocbook">Render as Docbook</option>
-<option value="refresh">Delete Cache</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="SpellCheck">Check Spelling</option>
-<option value="LikePages">Like Pages</option>
-<option value="LocalSiteMap">Local Site Map</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="RenamePage" disabled class="disabled">Rename Page</option>
-<option value="DeletePage" disabled class="disabled">Delete Page</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="show" disabled class="disabled">Subscribe User</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="show" disabled class="disabled">Remove Spam</option>
-<option value="show" disabled class="disabled">Revert to this revision</option>
-<option value="show" disabled class="disabled">Package Pages</option>
-<option value="SyncPages">Sync Pages</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="Load">Load</option>
-<option value="Save">Save</option>
-    </select>
-    <input type="submit" value="Do">
-    
-</div>
-<script type="text/javascript">
-<!--// Init menu
-actionsMenuInit('More Actions:');
-//-->
-</script>
-</form>
-</li></ul>
-
-</div>
-
-<div id="page" lang="en" dir="ltr">
-<div dir="ltr" id="content" lang="en"><span class="anchor" id="top"></span>
-<span class="anchor" id="line-1"></span><p class="line867">
-<h2 id="DebianEeePC.2BAC8-Live.2BAC8-UsersGuide">DebianEeePC/Live/UsersGuide</h2>
-<span class="anchor" id="line-2"></span><span class="anchor" id="line-3"></span><p class="line862">After downloading the image from <a href="/DebianEeePC/Live#USB.2BAC8-HDDimages">DebianEeePC/Live#USB.2BAC8-HDDimages</a> , copy it onto an unmounted USB device by <span class="anchor" id="line-4"></span><span class="anchor" id="line-5"></span><span class="anchor" id="line-6"></span><pre>dd if=eeepc-live-1.0~b1.img of=/dev/sdc
-sync</pre><span class="anchor" id="line-7"></span><p class="line874">Note that you copy it onto the whole device, not a partition on it. <span class="anchor" id="line-8"></span><span class="anchor" id="line-9"></span><p class="line867">
-<h4 id="Boot">Boot</h4>
-<span class="anchor" id="line-10"></span><p class="line874">At boot time you have to do several things to set everything up. <span class="anchor" id="line-11"></span><span class="anchor" id="line-12"></span><p class="line874">Insert the device with the live image on it and press the power button. <span class="anchor" id="line-13"></span>
-<h4 id="Camera">Camera</h4>
-<span class="anchor" id="line-14"></span><p class="line874">First hit F2 when switching on to get into the BIOS. <span class="anchor" id="line-15"></span><span class="anchor" id="line-16"></span><p class="line874">Use Right arrow to "Advanced", Down arrow to "Onboard Device Configuration", Enter, Down arrow to "Onboard Camera". This appears as "disabled by default" so use the - (minus sign, or dash) to select "enabled", F10 and then OK to save and exit. <span class="anchor" id="line-17"></span>
-<h4 id="BootDevice">Boot Device</h4>
-<span class="anchor" id="line-18"></span><p class="line874">Now hit Esc to choose boot device. (The screen says to hit TAB, but if that doesn't work use Esc.) <span class="anchor" id="line-19"></span>
-<h4 id="Language.26Keyboard">Language &amp; Keyboard</h4>
-<span class="anchor" id="line-20"></span><p class="line874">In this area - choose Help, and then F8 to install with special parameters. <span class="anchor" id="line-21"></span>For different languages, keyboards, etc you will find settings at <a class="http" href="http://webconverger.org/i18n/#index2h1">http://webconverger.org/i18n/#index2h1</a> <span class="anchor" id="line-22"></span><span class="anchor" id="line-23"></span><p class="line862">For example, if your eeepc has a spanish keyboard but you work in English you would type<span class="anchor" id="line-24"></span><span class="anchor" id="line-25"></span><pre>live locale=en keyb=es</pre><span class="anchor" id="line-26"></span><p class="line874">and hit return to continue the boot process. <span class="anchor" id="line-27"></span>
-<h4 id="InUse">In Use</h4>
-<span class="anchor" id="line-28"></span><p class="line874">If the system goes to sleep the password to wake it up again is "live". The username is already there, "user". <span class="anchor" id="line-29"></span><span class="anchor" id="line-30"></span><p class="line862">The camera can be called from the commandline by typing <span class="anchor" id="line-31"></span><span class="anchor" id="line-32"></span><pre>mplayer tv://</pre><span class="anchor" id="line-33"></span><p class="line862">or by opening SMPlayer, selecting <strong>&gt; Open &gt; URL</strong> and typing <tt>&nbsp;tv://&nbsp;</tt> <span class="anchor" id="line-34"></span>
-<h4 id="ToDo">ToDo</h4>
-<span class="anchor" id="line-35"></span><p class="line874">Everything will depend on how small the live image can be kept and sourcing suitable debian packages, but other possibilities are:- <span class="anchor" id="line-36"></span><ul><li>Configuration notes for Iceweasel. <span class="anchor" id="line-37"></span></li><li>Optional sleep on lid-closure - to allow continued downloading/music playing or VoIP use with the lid down. <span class="anchor" id="line-38"></span></li><li>IRC/Messenger client(s) <span class="anchor" id="line-39"></span></li><li>VoIP solution <span class="anchor" id="line-40"></span></li><li>Flash Player <span class="anchor" id="line-41"></span></li><li>Spreadsheet (sc or gnumeric) <span class="anchor" id="line-42"></span></li><li>.pdf reader <span class="anchor" id="line-43"></span></li></ul><span class="anchor" id="bottom"></span></div><p id="pageinfo" class="info" lang="en" dir="ltr">DebianEeePC/Live/UsersGuide  (last edited 2009-04-14 12:57:08 by <span title="jpinx @ 190.232.176.142[190.232.176.142]"><a href="/JohnPinkerton" title="jpinx @ 190.232.176.142[190.232.176.142]">JohnPinkerton</a></span>)</p>
-
-<div id="pagebottom"></div>
-</div>
-
-
-<div id="footer">
-<ul class="editbar"><li><span class="disabled">Immutable Page</span></li><li><a href="#" class="toggleCommentsButton" style="display:none;" onClick="toggleComments();return false;">Comments</a></li><li><a class="nbinfo" href="/DebianEeePC/Live/UsersGuide?action=info" rel="nofollow">Info</a></li><li><a class="nbattachments" href="/DebianEeePC/Live/UsersGuide?action=AttachFile" rel="nofollow">Attachments</a></li><li>
-<form class="actionsmenu" method="GET" action="/DebianEeePC/Live/UsersGuide">
-<div>
-    <label>More Actions:</label>
-    <select name="action"
-        onchange="if ((this.selectedIndex != 0) &&
-                      (this.options[this.selectedIndex].disabled == false)) {
-                this.form.submit();
-            }
-            this.selectedIndex = 0;">
-        <option value="raw">Raw Text</option>
-<option value="print">Print View</option>
-<option value="RenderAsDocbook">Render as Docbook</option>
-<option value="refresh">Delete Cache</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="SpellCheck">Check Spelling</option>
-<option value="LikePages">Like Pages</option>
-<option value="LocalSiteMap">Local Site Map</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="RenamePage" disabled class="disabled">Rename Page</option>
-<option value="DeletePage" disabled class="disabled">Delete Page</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="show" disabled class="disabled">Subscribe User</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="show" disabled class="disabled">Remove Spam</option>
-<option value="show" disabled class="disabled">Revert to this revision</option>
-<option value="show" disabled class="disabled">Package Pages</option>
-<option value="SyncPages">Sync Pages</option>
-<option value="show" disabled class="disabled">------------------------</option>
-<option value="Load">Load</option>
-<option value="Save">Save</option>
-    </select>
-    <input type="submit" value="Do">
-    
-</div>
-<script type="text/javascript">
-<!--// Init menu
-actionsMenuInit('More Actions:');
-//-->
-</script>
-</form>
-</li></ul>
-
-<ul id="credits">
-<li><a href="http://moinmo.in/" title="This site uses the MoinMoin Wiki software.">MoinMoin Powered</a></li><li><a href="http://moinmo.in/Python" title="MoinMoin is written in Python.">Python Powered</a></li><li><a href="http://validator.w3.org/check?uri=referer" title="Click here to validate this page.">Valid HTML 4.01</a></li><li>Hosting provided by <a href="http://www.dg-i.net/">Dembach Goo Informatik GmbH &amp; Co KG</a></li>
-</ul>
-
-
-</div>
-</body>
-</html>
-
diff --git a/config/chroot_local-packageslists/eeepc b/config/chroot_local-packageslists/eeepc
index 8502c1b..b5679ce 100644
--- a/config/chroot_local-packageslists/eeepc
+++ b/config/chroot_local-packageslists/eeepc
@@ -1,7 +1,8 @@
 locales
 eeepc-acpi-scripts
 xserver-xorg-video-intel xserver-xorg-video-vesa xserver-xorg-input-synaptics xserver-xorg-input-kbd xserver-xorg-input-mouse xserver-xorg-input-evdev xorg xserver-xorg-input-all- xserver-xorg-video-all-
-menu
+menu nano libgl1-mesa-dri bash-completion
 lxde dhcp3-client wicd aosd-cat hal iceweasel alsa-base alsa-utils
-tunapie streamripper audacious smplayer
+tunapie streamripper audacious smplayer amsn pidgin
 gksu synaptic cpufrequtils acpi gparted netcat wget apt-utils aptitude
+iputils-ping less ssh-client clive briquolo
diff --git a/config/chroot_sources/eeepc.chroot b/config/chroot_sources/eeepc.chroot
index 52a689d..ec08a59 100644
--- a/config/chroot_sources/eeepc.chroot
+++ b/config/chroot_sources/eeepc.chroot
@@ -1,2 +1,2 @@
-deb http://eeepc.debian.net/debian lenny main contrib non-free
-deb-src http://eeepc.debian.net/debian lenny main contrib non-free
+deb http://eeepc.debian.net/debian lenny main
+deb-src http://eeepc.debian.net/debian lenny main

-- 
A live-helper based Debian live & installer image for the Eee PC.



More information about the Debian-eeepc-commits mailing list