From: Andres Salomon <dilinger@queued.net>
Date: Mon, 22 Nov 2010 05:05:42 +0000 (-0800)
Subject: debxo-xfce: like lxde, switch to wicd and midori
X-Git-Tag: v0.6~4
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=799c87416c5aac25ce1bc4a4e34de728b5fee0fe;p=xodist

debxo-xfce: like lxde, switch to wicd and midori

...from nm-gnome and epiphany

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

diff --git a/configs/debxo-xfce/hooks b/configs/debxo-xfce/hooks
index bb3a3b8..d7dff81 100644
--- a/configs/debxo-xfce/hooks
+++ b/configs/debxo-xfce/hooks
@@ -92,6 +92,18 @@ EOF
 		sed --in-place "s/NODM_ENABLED=.*$/NODM_ENABLED=true/" ${F}
 	fi
 
+	# configure wicd
+	F=${ROOT_DIR}/etc/wicd/manager-settings.conf
+	# there's no actual config file in the package; it's autocreated or something.  ugh.
+	cp wicd-manager-settings.conf ${F}
+#       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-xfce/packages b/configs/debxo-xfce/packages
index 567ffa8..7051f41 100644
--- a/configs/debxo-xfce/packages
+++ b/configs/debxo-xfce/packages
@@ -40,7 +40,7 @@ xauth
 menu
 aspell-en
 ttf-liberation
-network-manager-gnome
+wicd-gtk
 pidgin
 evince-gtk
 parole
@@ -51,4 +51,4 @@ xfce4
 xfce4-goodies
 gksu
 synaptic
-epiphany-browser
+midori