diff --git a/nodes.ia b/nodes.ia index 0790451..3db1c0c 100644 --- a/nodes.ia +++ b/nodes.ia @@ -139,7 +139,7 @@ profiles auth-core nfs-core; # OS releases -@lucid/maverick/natty/oneiric/precise +@lucid/maverick/natty/oneiric/precise/quantal profiles ubuntu; @lenny/squeeze/wheezy/sid diff --git a/packages.ia b/packages.ia index 38f32e6..66bc48f 100644 --- a/packages.ia +++ b/packages.ia @@ -142,10 +142,12 @@ if @devel-full { # version control install git-core git-email git-cvs git-svn git-arch git-doc git-buildpackage mercurial subversion subversion-tools - darcs bzr bzrtools cvs cvsps diff wdiff - colordiff xxdiff patch patchutils quilt tig diffstat + darcs bzr bzrtools cvs cvsps wdiff + colordiff patch patchutils quilt tig diffstat @X gitk @X git-gui; + @!quantal install diff xxdiff; + @quantal install diffutils; @office @!precise install tkdiff; # debian @@ -253,15 +255,15 @@ 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 gnome-core-devel libgnome-dev/libgnome2-dev + @!precise @!quantal gnome-core-devel libgnome-dev/libgnome2-dev libghc6-x11-dev libghc6-x11-prof libghc6-x11-doc libgtkmm-2.4-dev; # gui tools @X install glade xutils-dev; # integrated development environments - @X install eclipse monodevelop monodevelop-python - monodevelop-vala monodevelop-java; + @X install eclipse monodevelop; + @X @!quantal install monodevelop-python monodevelop-vala monodevelop-java; # cross toolchains @squeeze @x86 @@ -340,9 +342,13 @@ if @general-use { @X rocs; # octave - install octave3.2/octave3.0 octave3.2-doc/octave3.0-doc - octave3.2-emacsen/octave3.0-emacsen + install octave/octave3.2/octave3.0 + octave-doc/octave3.2-doc/octave3.0-doc; + + @!quantal + install octave3.2-emacsen/octave3.0-emacsen octave3.2-headers/octave3.0-headers; + @!lenny install octave-audio octave-benchmark octave-communications-common octave-communications octave-control octave-data-smoothing @@ -351,18 +357,23 @@ if @general-use { octave-io octave-linear-algebra octave-mapping octave-miscellaneous octave-missing-functions octave-nan octave-nnet octave-nurbs octave-ocs octave-octcdf octave-octgpr octave-odepkg octave-optim - octave-optiminterp octave-parallel octave-pkg-dev octave-plot + octave-optiminterp octave-pkg-dev octave-plot octave-secs1d octave-secs2d octave-signal octave-specfun octave-splines octave-statistics octave-strings octave-struct - octave-symbolic octave-time octave-tsa octave-vrml octave-zenity + octave-symbolic octave-tsa octave-vrml octave-zenity octave-pfstools octave-plplot; # These don't exist in precise. @!lenny @!precise + install octave-sockets; + + @!lenny @!precise @!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-sockets octave-symband - octave-sp; + octave-outliers octave-pdb octave-simp octave-symband octave-sp; + + @!lenny @!quantal + install octave-parallel octave-time; # xml install xsltproc libxml2-utils docbook-xsl docbook-utils docbook-dsssl @@ -393,11 +404,12 @@ if @general-use { install rdiff tofrodos mc socat snmp @!lenny snmp-mibs-downloader @!lucid @!maverick busybox-static/busybox @lucid/maverick busybox-static uboot-mkimage most - bonnie++ latencytop time bsdmainutils dctrl-tools ddrescue gddrescue - file parchive par2 realpath reportbug rpm shtool smbclient stow xstow - sysstat unison john iotop sg3-utils attr dstat @!container i2c-tools - rstat-client dnstracer parted tree apt-file makepasswd - @x86 syslinux finger fdupes bchunk cowsay 9base libjpeg-progs; + bonnie++ latencytop time bsdmainutils dctrl-tools @!quantal ddrescue + gddrescue file parchive par2 realpath reportbug rpm shtool smbclient + stow xstow sysstat unison john iotop sg3-utils attr dstat + @!container i2c-tools rstat-client dnstracer parted tree apt-file + makepasswd @x86 syslinux finger fdupes bchunk cowsay 9base + libjpeg-progs; # serial install minicom cu; @@ -442,10 +454,12 @@ if @X { # fonts install @!precise console-terminus xfonts-terminus gsfonts gsfonts-x11 - ttf-dejavu ttf-opensymbol ttf-freefont; + ttf-dejavu @!quantal ttf-opensymbol @quantal fonts-opensymbol + ttf-freefont; # office - install openoffice.org scribus gimp xfig dia inkscape; + install scribus gimp xfig dia inkscape; + install @!quantal openoffice.org @quantal libreoffice; # messaging install pidgin pidgin-otr empathy; @@ -484,7 +498,7 @@ if @X { # electronics install geda arduino ngspice bristol cl-rlc electric gerbv gnucap gpsim gsmc gspiceui gtkwave linsmith - oregano pcb pcb-gtk qucs tkgate xcircuit xsmc-calc + oregano pcb pcb-gtk @!quantal qucs tkgate xcircuit xsmc-calc kic kicad; # virtualization