From 7729d8851f16f140872ee78eebeac2962d699cbd Mon Sep 17 00:00:00 2001
From: Jeremy Roman <jbroman@csclub.uwaterloo.ca>
Date: Sun, 12 Jan 2014 17:41:19 -0500
Subject: [PATCH] more updating package list

---
 packages.ia | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages.ia b/packages.ia
index 34ea975..4c4ef35 100644
--- a/packages.ia
+++ b/packages.ia
@@ -178,10 +178,10 @@ if @devel-full {
     install mono-vbnc;
 
     # java
-    install openjdk-6-jdk;
+    install openjdk-7-jdk/openjdk-6-jdk;
 
     # haskell
-    install ghc/ghc6 ghc/ghc6-doc haskell-platform;
+    install ghc/ghc6 ghc-doc/ghc6-doc haskell-platform;
 
     # ocaml
     install ocaml camlp4;
@@ -259,8 +259,8 @@ if @devel-full {
             libsdl1.2-dev freeglut3-dev libgl1-mesa-dev libglu1-mesa-dev
             @!quantal gnome-core-devel libgnome-dev/libgnome2-dev
             libghc-x11-dev/libghc6-x11-dev
-            libghc-x11-dev/libghc6-x11-prof
             libghc-x11-doc/libghc6-x11-doc
+            libghc-x11-prof/libghc6-x11-prof
             libgtkmm-2.4-dev;
 
     # gui tools
@@ -361,7 +361,7 @@ if @general-use {
 	    octave-missing-functions octave-nan octave-nnet octave-nurbs
 	    octave-ocs octave-octcdf octave-octgpr octave-odepkg octave-optim
 	    octave-optiminterp octave-pkg-dev octave-plot
-	    octave-secs1d octave-secs2d octave-signal octave-specfun
+	    octave-secs2d octave-signal octave-specfun
 	    octave-splines octave-statistics octave-strings octave-struct
 	    octave-symbolic octave-tsa octave-vrml octave-zenity
 	    octave-pfstools octave-plplot;
@@ -369,8 +369,8 @@ if @general-use {
     @!quantal @!jessie
     install octave-ad octave-combinatorics octave-fixed octave-ftp octave-ident
             octave-informationtheory octave-irsa octave-multicore octave-nlwing2
-            octave-outliers octave-pdb octave-plplot octave-simp octave-symband
-            octave-sp octave-parallel octave-time;
+            octave-outliers octave-pdb octave-plplot octave-secs1d octave-simp
+            octave-symband octave-sp octave-parallel octave-time;
 
     # xml
     install xsltproc libxml2-utils docbook-xsl docbook-utils docbook-dsssl
@@ -492,6 +492,10 @@ if @X {
     # xfce
     install xfce4;
 
+    # lightdm is the preferred display manager
+    @office install lightdm lightdm-gtk-greeter;
+    @office remove gdm kdm;
+
     # electronics
     install geda arduino ngspice bristol cl-rlc electric
             gerbv gnucap gpsim gsmc gspiceui gtkwave linsmith