From 370a6c132fa61a2e2afd49ecb0abbc1ed45dbfd6 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 21 Aug 2012 12:38:52 -0400
Subject: [PATCH] trying to switch from gnome to more lightweight XFCE. TODOs
 are in the initial_setup script

---
 vm/d-i/wheezy/initial_setup | 23 +++++++++++++++++++----
 vm/tools/nd_createappliance |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/vm/d-i/wheezy/initial_setup b/vm/d-i/wheezy/initial_setup
index bdddf3e..8757eec 100755
--- a/vm/d-i/wheezy/initial_setup
+++ b/vm/d-i/wheezy/initial_setup
@@ -87,7 +87,8 @@ apt-get install -y linux-headers-2.6-$cdarch
 ## 	>| /var/log/initial_setup-dkms.log 2>&1
 
 # to get all the rest stuff in recommends
-apt-get install -y dkms neurodebian-guest-additions
+apt-get install -y dkms
+# TODO: neurodebian-guest-additions
 
 if [ "$darch" != "$cdarch" ] ; then
     # Because DKMS builds for currently running kernel, which during
@@ -112,10 +113,24 @@ adduser brain vboxsf
 # assure at the end that we got right modules build in the right location
 find /lib/modules/*$darch -iname vboxsf.ko | grep -q .
 
+# That was for GNOME
+# apt-get install --no-install-recommends -y \
+#  gnome-core mc evince bash-completion ntpdate file-roller gnome-utils \
+#  gnome-themes gnome-disk-utility network-manager-gnome eog vim reportbug \
+#  software-center gdebi gedit-plugins gnome-media synaptic menu less libxp6
+
 apt-get install --no-install-recommends -y \
- gnome-core mc evince bash-completion ntpdate file-roller \
- gnome-themes eog vim reportbug \
- software-center gdebi gedit-plugins gnome-media synaptic menu less libxp6
+ mc evince bash-completion ntpdate file-roller \
+ eog vim reportbug \
+ software-center synaptic menu less libxp6 \
+ task-xfce-desktop lightdm \
+ chromium-browser \
+ sudo neurodebian-desktop update-notifier
+
+# XXX last ones are actually pulled it by neurodebian-guest-additions whenever we
+# resolve their destiny ;-)   a;though it might be pooling too much, eg exim4
+
+# TODO: autologin for lightdm (autologin-user=brain in /etc/lightdm/lightdm.conf), default panel (with chromium) for xfce
 
 # Clean-up installed development files which got pulled in for
 # VM guest additions (to build kernel modules via DKMS)
diff --git a/vm/tools/nd_createappliance b/vm/tools/nd_createappliance
index b5bdb08..d4fb316 100755
--- a/vm/tools/nd_createappliance
+++ b/vm/tools/nd_createappliance
@@ -14,7 +14,7 @@ di_host=head1.hydra.dartmouth.edu               # where to look for di preseed
 build_dir=$PWD/build
 dist_dir=$PWD/dist
 vendor="NeuroDebian"
-vm_version="6.999.20120716"
+vm_version="6.999.20120720"
 vm_ostype=Debian
 vendor_url="http://neuro.debian.net"
 product_url="${vendor_url}/vm.html"
-- 
2.39.2