diff --git a/nodes.ia b/nodes.ia index bfe084d..10b04e5 100644 --- a/nodes.ia +++ b/nodes.ia @@ -3,7 +3,7 @@ profiles core; # Computer Science Club Office Terminals @strombola -profiles csclub office machine amd64 quantal audio; +profiles csclub office machine amd64 trusty; @maltodextrin profiles csclub office machine amd64 quantal webcam; diff --git a/packages.ia b/packages.ia index 46c0442..52d331d 100644 --- a/packages.ia +++ b/packages.ia @@ -55,7 +55,7 @@ if @core { # physical machine (non virtual server) if @machine { - install lm-sensors smartmontools hwinfo lshw @armel mtd-utils + install lm-sensors smartmontools @!trusty hwinfo lshw @armel mtd-utils @x86 acpid @x86 acpi @x86 @!lucid @!ubuntu acpi-support-base @!sparc @!mips @!alpha @!mipsel kexec-tools @x86 vbetool fbset @x86 read-edid; @@ -258,7 +258,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 - @!quantal gnome-core-devel libgnome-dev/libgnome2-dev + @!quantal @!trusty gnome-core-devel libgnome-dev/libgnome2-dev libghc-x11-dev/libghc6-x11-dev libghc-x11-doc/libghc6-x11-doc libghc-x11-prof/libghc6-x11-prof @@ -350,7 +350,7 @@ if @general-use { install octave/octave3.2/octave3.0 octave-doc/octave3.2-doc/octave3.0-doc; - @!quantal + @!quantal @!trusty install octave3.2-emacsen/octave3.0-emacsen octave3.2-headers/octave3.0-headers; @@ -367,7 +367,7 @@ if @general-use { octave-symbolic octave-tsa octave-vrml octave-zenity octave-pfstools octave-plplot; - @!quantal @!jessie + @!quantal @!jessie @!trusty 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-secs1d octave-simp @@ -402,7 +402,7 @@ if @general-use { install rdiff tofrodos mc socat snmp snmp-mibs-downloader @!lucid @!maverick busybox-static/busybox @lucid/maverick busybox-static uboot-mkimage most - bonnie++ latencytop time bsdmainutils dctrl-tools @!quantal ddrescue + bonnie++ latencytop time bsdmainutils dctrl-tools @!quantal @!trusty 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 @@ -435,6 +435,7 @@ if @x-core { # web browsers install firefox/iceweasel google-chrome-stable chromium; + remove google-chrome-unstable google-chrome-testing; }; if @X { @@ -456,8 +457,8 @@ if @X { # fonts install console-terminus/console-setup-linux xfonts-terminus gsfonts - gsfonts-x11 ttf-dejavu @!quantal ttf-opensymbol - @quantal fonts-opensymbol ttf-freefont; + gsfonts-x11 ttf-dejavu @!quantal @!trusty ttf-opensymbol + @quantal @trusty fonts-opensymbol ttf-freefont; # office install scribus gimp xfig dia inkscape; @@ -505,7 +506,7 @@ if @X { # electronics install geda arduino ngspice bristol cl-rlc electric gerbv gnucap gpsim gsmc gspiceui gtkwave linsmith - oregano pcb pcb-gtk @!quantal qucs tkgate xcircuit xsmc-calc + oregano pcb pcb-gtk @!quantal @!trusty qucs tkgate xcircuit xsmc-calc kic kicad; # virtualization