From 15a8866e3d98808001f25d9e173c10743320cb69 Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@csclub.uwaterloo.ca>
Date: Mon, 25 Jul 2011 02:23:48 -0400
Subject: [PATCH] Updates

---
 nodes.ia    |  4 ++--
 packages.ia | 45 ++++++++++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/nodes.ia b/nodes.ia
index 66b2c3d..71c6698 100644
--- a/nodes.ia
+++ b/nodes.ia
@@ -23,7 +23,7 @@ profiles csclub office machine amd64 natty;
 profiles csclub server container amd64 general-use mta squeeze;
 
 @taurine
-profiles csclub server machine amd64 general-use squeeze;
+profiles csclub server machine amd64 general-use squeeze X;
 
 @corn-syrup
 profiles csclub server machine amd64 general-use squeeze;
@@ -114,7 +114,7 @@ profiles server machine armel squeeze general-small;
 profiles x86;
 
 @office
-profiles general-use X;
+profiles general-use X x-full;
 
 @general-use
 profiles devel-core devel-full auth-core nfs-core;
diff --git a/packages.ia b/packages.ia
index b41726f..7d3caf0 100644
--- a/packages.ia
+++ b/packages.ia
@@ -25,7 +25,7 @@ if @core {
             ftp tftp;
 
     # package management
-    install aptitude dselect;
+    install aptitude dselect unattended-upgrades;
 
     # crypto
     install gnupg;
@@ -214,8 +214,8 @@ if @devel-full {
             ruby1.9-dev/ruby1.9.1-dev;
 
     # llvm
-    install @!lenny clang llvm llvm-dev
-            @x86 llvm-gcc-4.2;
+    install @!lenny clang llvm-2.9/llvm llvm-2.9-dev/llvm-dev
+            @x86 @!wheezy llvm-gcc-4.2;
 
     # scheme
     install gauche-dev gambc mit-scheme-doc chicken-bin
@@ -249,9 +249,9 @@ if @devel-full {
             libalut-dev libopenal-dev python-dev libapt-pkg-dev
             linux-libc-dev libgnutls-dev libkrb5-dev libreadline6-dev/libreadline5-dev
             libncurses5-dev libncursesw5-dev libghc6-x11-dev libghc6-mtl-dev
-            libghc6-quickcheck-dev libghc6-x11-prof libghc6-mtl-prof
-            libghc6-quickcheck-prof libghc6-x11-doc libghc6-mtl-doc
-            libghc6-quickcheck-doc libghc6-network-dev libghc6-parsec-dev
+            libghc6-x11-prof libghc6-mtl-prof
+            libghc6-x11-doc libghc6-mtl-doc
+            libghc6-network-dev libghc-parsec3-dev/libghc6-parsec-dev
             libboost-dev libgtkmm-2.4-dev
             zlib1g-dev libcurl4-gnutls-dev libexpat1-dev libglib2.0-dev
             libgmp3-dev libpq-dev libsasl2-dev libsctp-dev libsqlite3-dev
@@ -262,7 +262,7 @@ if @devel-full {
             libsigc++-dev @amd64/i386 @!natty libbullet-dev;
 
     # X development libraries
-    install xorg-dev libgtk2.0-dev libqt4-dev kdelibs4-dev
+    install xorg-dev libgtk2.0-dev libqt4-dev #kdelibs5-dev/kdelibs4-dev
             libsdl1.2-dev freeglut3-dev libgl1-mesa-dev
             libglu1-mesa-dev
             @X gnome-core-devel
@@ -359,14 +359,14 @@ if @general-use {
             octave3.2-emacsen/octave3.0-emacsen
 	    octave3.2-headers/octave3.0-headers;
     @!lenny
-    install octave-ad octave-audio octave-benchmark octave-bim
+    install octave-ad octave-audio octave-benchmark @!wheezy octave-bim
             octave-combinatorics octave-communications-common
             octave-communications octave-control octave-data-smoothing
             octave-econometrics octave-epstk octave-financial octave-fixed octave-fpl
             octave-ftp octave-ga octave-general octave-gsl octave-ident octave-image
-            octave-informationtheory octave-integration octave-io octave-irsa
+            octave-informationtheory @!wheezy octave-integration octave-io octave-irsa
             octave-linear-algebra octave-mapping octave-miscellaneous
-            octave-missing-functions octave-msh octave-multicore octave-nan
+            octave-missing-functions @!wheezy octave-msh octave-multicore octave-nan
             octave-nlwing2 octave-nnet octave-nurbs octave-ocs octave-octcdf
             octave-octgpr octave-odepkg octave-optim octave-optiminterp
             octave-outliers octave-parallel octave-pdb
@@ -423,19 +423,30 @@ if @general-use {
 
     # club management
     @csclub @amd64
-    @!natty
+    @!natty @!wheezy
     install ceo-python;
 };
 
 if @X {
     # base
-    install xserver-xorg xfonts-base;
+    install xserver-xorg xfonts-base gdm;
 
     # utils
-    install xauth xsel gksu sux workrave;
+    install xauth xsel gksu sux;
 
     # terminal emulators
-    install xterm gnome-terminal rxvt rxvt-unicode yakuake;
+    install xterm rxvt rxvt-unicode gnome-terminal;
+
+    # web browsers
+    install firefox/iceweasel google-chrome-stable;
+};
+
+if @x-full {
+    # utils
+    install workrave;
+
+    # terminal emulators
+    install yakuake;
 
     # window managers
     install xmonad stumpwm wmii @!maverick @!natty ion3;
@@ -456,8 +467,8 @@ if @X {
     install pidgin pidgin-otr empathy;
 
     # browsers
-    install firefox/iceweasel thunderbird/icedove epiphany-browser
-            @!lenny midori google-chrome-stable flashplugin-installer;
+    install thunderbird/icedove epiphany-browser
+            @!lenny midori flashplugin-installer;
 
     # multimedia
     install audacity @!natty kstreamripper audacious @!natty lmms k3b
@@ -473,7 +484,7 @@ if @X {
     install xtrkcad @!lenny freecad pythoncad;
 
     # gnome
-    install gdm @!lucid @!maverick @!natty gdm-themes gnome-core gnome-office gnome-themes
+    install @!lucid @!maverick @!natty gdm-themes gnome-core gnome-office gnome-themes
             gnome-themes-extras rhythmbox gnome-rdp
             @!karmic @!lucid @!maverick gnome-desktop-environment;