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

[Ben Armstrong]

The following commit has been merged in the master branch:
commit c20600cf6f4eba76a5800ab807b792c9b1cb865c
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Apr 26 14:00:52 2009 -0300

    Start work on beta2; adjust package list; disable screensaver lock

diff --git a/Changelog b/Changelog
index bbbf5af..772dcf4 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,13 @@
+1.0~b2
+------
+ * Add acpi, cpufrequtils.
+ * Add misc useful utilities: gparted, netcat.
+ * Ensure synaptic and wget don't get removed by the
+   minimal hook.
+ * Disable xscreensaver lock on suspend.
+
 1.0~b1
--------
+------
  * Rebuild against panthera's 2.6.29 kernel backport.
  * Change to wicd from backports.org instead of sid.
  * Use eeepc-acpi-scripts 1.1.0 from sid.
diff --git a/config/chroot b/config/chroot
index baf0f8e..519d644 100644
--- a/config/chroot
+++ b/config/chroot
@@ -34,7 +34,7 @@ LH_LINUX_FLAVOURS="686"
 
 # $LH_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6.29-backports.1 aufs-modules-2.6.29-backports.1"
+LH_LINUX_PACKAGES="linux-image-2.6 aufs-modules-2.6"
 
 # $LH_PACKAGES: set packages to install
 # (Default: empty)
diff --git a/config/chroot_local-hooks/eeepc.sh b/config/chroot_local-hooks/eeepc.sh
index 9ec6346..ba30fa9 100755
--- a/config/chroot_local-hooks/eeepc.sh
+++ b/config/chroot_local-hooks/eeepc.sh
@@ -4,4 +4,6 @@ echo "modprobe -r snd-hda-intel" >> /etc/default/halt
 echo "HWCLOCKPARS=--directisa" >> /etc/default/rcS
 
 # Demo a few features that are not turned on by default
-sed -i "s/ENABLE_OSD='no'/ENABLE_OSD='yes'/" /etc/default/eeepc-acpi-scripts
+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)
diff --git a/config/chroot_local-packageslists/eeepc b/config/chroot_local-packageslists/eeepc
index 74b6b35..8502c1b 100644
--- a/config/chroot_local-packageslists/eeepc
+++ b/config/chroot_local-packageslists/eeepc
@@ -4,4 +4,4 @@ xserver-xorg-video-intel xserver-xorg-video-vesa xserver-xorg-input-synaptics xs
 menu
 lxde dhcp3-client wicd aosd-cat hal iceweasel alsa-base alsa-utils
 tunapie streamripper audacious smplayer
-gksu synaptic
+gksu synaptic cpufrequtils acpi gparted netcat wget apt-utils aptitude

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