diff --git a/nodes.ia b/nodes.ia index f20f418..6327beb 100644 --- a/nodes.ia +++ b/nodes.ia @@ -142,8 +142,8 @@ profiles auth-core nfs-core; # OS releases -@lucid/maverick/natty/oneiric/precise/quantal +@quantal profiles ubuntu; -@lenny/squeeze/wheezy/sid +@squeeze/wheezy/jessie/sid profiles debian; diff --git a/packages.ia b/packages.ia index 3f1e249..c169342 100644 --- a/packages.ia +++ b/packages.ia @@ -148,7 +148,7 @@ if @devel-full { @X git-gui; @!quantal install diff xxdiff; @quantal install diffutils; - @office @!precise install tkdiff; + @office install tkdiff; # debian install debhelper dh-make dh-make-perl dh-buildinfo dbs cdbs dpatch @@ -218,7 +218,7 @@ if @devel-full { @x86 scheme2c scheme9 @x86 stalin @x86 plt-scheme - @wheezy/sid/oneiric/precise racket racket-doc; + @wheezy/sid racket racket-doc; # tcl/tk install tcl tcl-dev tcl8.5; @@ -255,7 +255,7 @@ if @devel-full { @x-core install xorg-dev libgtk2.0-dev libqt4-dev libsdl1.2-dev freeglut3-dev libgl1-mesa-dev libglu1-mesa-dev - @!precise @!quantal gnome-core-devel libgnome-dev/libgnome2-dev + @!quantal gnome-core-devel libgnome-dev/libgnome2-dev libghc6-x11-dev libghc6-x11-prof libghc6-x11-doc libgtkmm-2.4-dev; # gui tools @@ -290,7 +290,7 @@ if @general-use { install gnupg-agent gnupg2 openssl; # network - install @!precise ipset ipcalc iftop nmap openipmi @x86 ipmitool cdpr lksctp-tools + install ipset ipcalc iftop nmap openipmi @x86 ipmitool cdpr lksctp-tools iptables ebtables arptables tsocks freeipmi-tools lftp ncftp axel @X wireshark; @@ -362,11 +362,7 @@ if @general-use { octave-symbolic octave-tsa octave-vrml octave-zenity octave-pfstools octave-plplot; - # These don't exist in precise. - @!precise - install octave-sockets; - - @!precise @!quantal + @!quantal install octave-ad octave-combinatorics octave-ftp octave-ident octave-informationtheory octave-irsa octave-multicore octave-nlwing2 octave-outliers octave-pdb octave-simp octave-symband octave-sp; @@ -420,7 +416,7 @@ if @general-use { # club management @csclub @amd64 - @!natty @!wheezy @!precise + @!wheezy install ceo-python; }; @@ -452,13 +448,13 @@ if @X { install xmobar; # fonts - install @!precise console-terminus xfonts-terminus gsfonts gsfonts-x11 + install console-terminus xfonts-terminus gsfonts gsfonts-x11 ttf-dejavu @!quantal ttf-opensymbol @quantal fonts-opensymbol ttf-freefont; # office install scribus gimp xfig dia inkscape; - install @!quantal openoffice.org @quantal libreoffice; + install libreoffice/openoffice.org; # messaging install pidgin pidgin-otr empathy; @@ -468,7 +464,7 @@ if @X { midori flashplugin-installer; # multimedia - install audacity @!ubuntu kstreamripper audacious lmms k3b + install audacity kstreamripper audacious lmms k3b ardour imagemagick blender gthumb eog; # documents @@ -484,11 +480,11 @@ if @X { install xtrkcad freecad pythoncad; # gnome - install gnome-themes-extras gnome-themes-standard gnome-themes-ubuntu - rhythmbox gnome-rdp @precise gnome-session-fallback; + install gnome-themes-extras gnome-themes-standard @ubuntu gnome-themes-ubuntu + rhythmbox gnome-rdp gnome-session-flashback/gnome-session-fallback; # kde - install @!kdebase kdebase-runtime kdeutils + install kdebase kdebase-runtime kdeutils @squeeze kde-core kdebase-workspace; # xfce