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

[Ben Armstrong]

The following commit has been merged in the master branch:
commit b05fe702f5dc9af479e48700ecb56f2092d2134f
Author: Ben Armstrong <synrg at debian.org>
Date:   Mon Mar 15 10:42:33 2010 -0300

    Bring up-to-date with squeeze archive; drop apt-pinning sid

diff --git a/Changelog b/Changelog
index 6e9c773..45bb0c2 100644
--- a/Changelog
+++ b/Changelog
@@ -1,8 +1,8 @@
 1.0~b3
 ------
  * Switch from lenny to squeeze.
- * Update to live-helper 2.0~a8-1: 'lh command', etc.
- * Rebuild against 2.6.32 kernel in sid; no longer needs aufs.
+ * Update to live-helper 2.0~a9-1: 'lh command', etc.
+ * Rebuild against 2.6.32 kernel; no longer needs aufs.
  * Remove some things to accommodate for actual size of some SD
    media being as small as 241M instead of the reported 256M
    and to reserve some space for future addition of installer.
@@ -26,7 +26,7 @@
  * Start gmplayer fullscreen and with vorbis codec.
  * Associate default applications with demo file types.
  * Include irssi config to autojoin #debian-eeepc.
- * Include gsynaptics to configure touchpad.
+ * Include gpointing-device-settings to configure touchpad.
  * Default wicd wireless interface to wlan0.
  * Correct gmplayer subtitle font config to eliminate warning.
  * Remove non-eee kernel modules to make some more room.
diff --git a/auto/clean b/auto/clean
index 5ef5869..90634ac 100755
--- a/auto/clean
+++ b/auto/clean
@@ -4,7 +4,6 @@ rm -f build.log
 
 # Remove generated files
 rm -f config/binary config/bootstrap config/chroot config/common config/source
-rm -f config/chroot_sources/sid.*
 
 # Remove empty directories in config tree
 if ls config/*/ > /dev/null 2>&1
diff --git a/auto/config b/auto/config
index 0798ee0..965241c 100755
--- a/auto/config
+++ b/auto/config
@@ -35,7 +35,7 @@ lh config noautoconfig \
 	-b usb-hdd \
 	--distribution squeeze \
         --archive-areas "main non-free" \
-	--linux-packages "linux-image-2.6.32-3" \
+	--linux-packages "linux-image-2.6" \
 	--memtest none \
 	--mirror-bootstrap ${MIRROR_BOOTSTRAP} \
 	--mirror-chroot ${MIRROR_CHROOT} \
@@ -45,6 +45,3 @@ lh config noautoconfig \
 	--binary-indices false \
 	--packages-lists "standard" \
 	${@}
-echo -e "deb $MIRROR_CHROOT sid main\ndeb-src $MIRROR_CHROOT sid main" >config/chroot_sources/sid.chroot
-echo -e "deb $MIRROR_BINARY sid main\ndeb-src $MIRROR_BINARY sid main" >config/chroot_sources/sid.binary
-
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
deleted file mode 100644
index 33804e4..0000000
--- a/config/chroot_apt/preferences
+++ /dev/null
@@ -1,12 +0,0 @@
-Package: eeepc-acpi-scripts
-Pin: version 1.1.10
-Pin-Priority: 900
-
-Package: *
-Pin: release a=testing
-Pin-Priority: 900
-
-Package: *
-Pin: release a=unstable
-Pin-Priority: 800
-
diff --git a/config/chroot_local-packageslists/eeepc.list b/config/chroot_local-packageslists/eeepc.list
index 43cc5d2..6d3375c 100644
--- a/config/chroot_local-packageslists/eeepc.list
+++ b/config/chroot_local-packageslists/eeepc.list
@@ -5,5 +5,5 @@ menu nano libgl1-mesa-dri bash-completion
 lxde dhcp3-client wicd aosd-cat hal iceweasel alsa-base alsa-utils
 irssi mplayer
 gksu synaptic cpufrequtils acpi gparted netcat wget aptitude
-iputils-ping less ssh-client briquolo zenity gpe-screenshot gsynaptics
+iputils-ping less ssh-client briquolo zenity gpe-screenshot gpointing-device-settings 
 bluetooth gnome-bluetooth obexpushd smbfs httpfs2

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