From: Andres Salomon <dilinger@queued.net>
Date: Sat, 20 Nov 2010 04:22:14 +0000 (-0800)
Subject: debxo-lxde: package update for squeeze
X-Git-Tag: v0.6~9
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7494ecfc39bdd71defd3506f0b42328a7533179;p=xodist

debxo-lxde: package update for squeeze

Make LXDE actually install on squeeze; use chromium as the browser, wicd for
network stuff, etc.

Signed-off-by: Andres Salomon <dilinger@queued.net>
---

diff --git a/configs/debxo-lxde/hooks b/configs/debxo-lxde/hooks
index f1e4d2e..66bb63a 100644
--- a/configs/debxo-lxde/hooks
+++ b/configs/debxo-lxde/hooks
@@ -92,6 +92,16 @@ EOF
 		sed --in-place "s/NODM_ENABLED=.*$/NODM_ENABLED=true/" ${F}
 	fi
 
+	# configure wicd
+	F=${ROOT_DIR}/etc/wicd/manager-settings.conf
+	if [ -f ${F} ]; then
+		sed --in-place "s/wireless_interface =.*$/wireless_interface = wlan0/" ${F}
+		sed --in-place "s/wired_inferface =.*$/wired_interface = eth0/" ${F}
+		# auto-connect to wired
+		sed --in-place "s/prefer_wired =.*$/prefer_wired = True/" ${F}
+		sed --in-place "s/wired_connect_mode =.*$/wired_connect_mode = 0/" ${F}
+	fi
+
 }
 
 cleanup_chroot_hook()
diff --git a/configs/debxo-lxde/packages b/configs/debxo-lxde/packages
index 4c065de..5a6589c 100644
--- a/configs/debxo-lxde/packages
+++ b/configs/debxo-lxde/packages
@@ -21,7 +21,6 @@ bzip2
 info
 manpages-dev
 rsync
-links2
 
 # X
 xserver-xorg-core
@@ -41,9 +40,11 @@ xauth
 menu
 aspell-en
 ttf-liberation
-big-cursor
+wicd-gtk
+epdfview
 lxde
-lxnm
-lxsession-lite
-lxterminal
-netsurf
+gvfs-backends
+gvfs-fuse
+policykit-1
+chromium-browser
+fotoxx