From 12c21f1d8049b99c7992ff72e88610367d0a0172 Mon Sep 17 00:00:00 2001 From: Jeremy Roman Date: Mon, 19 Mar 2012 14:48:16 -0400 Subject: [PATCH] cleaning up with pbarfuss --- nodes.ia | 4 +- packages.ia | 195 ++++++++++++++++++++++++---------------------------- 2 files changed, 91 insertions(+), 108 deletions(-) diff --git a/nodes.ia b/nodes.ia index 3c25e14..5c89002 100644 --- a/nodes.ia +++ b/nodes.ia @@ -15,7 +15,7 @@ profiles csclub office machine i386 oneiric; profiles csclub office machine amd64 oneiric; @nullsleep -profiles csclub office machine amd64 natty; +profiles csclub office machine amd64 natty audio; @gwem profiles csclub office machine amd64 precise; @@ -35,7 +35,7 @@ profiles csclub server machine amd64 general-use squeeze; profiles csclub server machine sparc general-use squeeze nosmp; @potassium-citrate -profiles csclub server machine alpha general-use lenny; +profiles csclub server machine alpha lenny; @denardo profiles csclub server machine sparc general-use squeeze; diff --git a/packages.ia b/packages.ia index 910b772..549c5ac 100644 --- a/packages.ia +++ b/packages.ia @@ -3,11 +3,15 @@ if @core { # shells - install bash zsh dash ksh tcsh csh rc; + install bash zsh dash ksh tcsh csh rc bash-doc zsh-beta bash-completion + zsh-doc zsh-beta-doc bashdb; # editors install ed vim nano; + # words + install wamerican-insane; + # utils install acl screen less lsof bc dc psmisc procps htop schedtool pciutils usbutils rsync; @@ -70,9 +74,12 @@ if @container { }; if @auth-core { - install nscd @!lenny nslcd libnss-ldapd ldap-utils libpam-krb5 krb5-user + install @!lenny nslcd libnss-ldapd ldap-utils libpam-krb5 krb5-user ldapvi libsasl2-modules-gssapi-mit; + @office + install nscd; + @csclub install libpam-csc; }; @@ -108,6 +115,7 @@ if @devel-full { install gcc-doc cpp-doc binutils-doc binutils-multiarch manpages-posix-dev + gperf glibc-doc @!ubuntu glibc-doc-reference @!alpha gcc-multilib; @@ -117,45 +125,32 @@ if @devel-full { @x86 ltrace; # profiling - install gperf libc6-prof/libc6.1-prof; + install libc6-prof/libc6.1-prof; # assembly - install bin86 nasm yasm; + @x86 install bin86 nasm yasm; # scanning and parsing install flex flex-doc bison bison-doc ragel - antlr antlr-doc python-antlr happy frown frown-doc - byacc kelbt lemon bnfc jflex jlex re2c bisonc++ - python-ply python-pyparsing btyacc @!alpha mono-jay pccts - kimwitu kimwitu-doc kimwitu++ menhir racc wyg - @i386/amd64/powerpc @!alpha coco-cpp @!alpha - coco-cs @!alpha coco-java coco-doc cup - javacc javacc-doc python-yappy yapps2 - styx styx-dev styx-doc liblua5.1-lpeg-dev - @!debian @!ubuntu cl-yacc; + byacc re2c; # build systems - install make-doc ccache @!lenny distcc ant ant-optional scons qt4-qmake + install make-doc ccache ant ant-optional scons qt4-qmake autogen autoconf-doc autoconf2.13 automake1.9 automake1.9-doc autotools-dev autoproject kbuild; # version control install git-core git-email git-cvs git-svn git-arch git-doc - git-buildpackage guilt stgit @!lenny topgit mercurial subversion subversion-tools - @!debian @!ubuntu svk darcs bzr bzrtools rcs cvs cvsps cssc tla tla-doc diff wdiff - colordiff xxdiff @!precise tkdiff patch patchutils quilt tig diffstat - pristine-tar - @x86 monotone + git-buildpackage mercurial subversion subversion-tools + darcs bzr bzrtools cvs cvsps diff wdiff + colordiff xxdiff patch patchutils quilt tig diffstat @X gitk @X git-gui; - - # semantic analyzers - install sparse @!lenny coccinelle; + @office @!precise install tkdiff; # debian install debhelper dh-make dh-make-perl dh-buildinfo dbs cdbs dpatch - kernel-package lintian alien po-debconf pbuilder dpkg-repack - schroot; + kernel-package lintian alien po-debconf pbuilder dpkg-repack; # i18n install gettext; @@ -167,10 +162,10 @@ if @devel-full { install doxygen exuberant-ctags; # editing - install @!wheezy @!ubuntu jde indent; + install indent; # c/c++ - install cutils stl-manual bcc; + install cutils stl-manual; # c# @!alpha @@ -185,28 +180,28 @@ if @devel-full { install openjdk-6-jdk; # haskell - install ghc6 ghc6-doc - @!lenny @!ubuntu haskell-platform; + install ghc6 ghc6-doc @!lenny haskell-platform; # ocaml install ocaml camlp4; # perl - install perl-doc libsvn-perl libdbd-sqlite3-perl; + install perl-doc; # python install python-all-dev python-m2crypto python-mysqldb python-imaging python-libxml2 python-libxslt1 python-numpy python-numpy-doc python-twisted python-support - python-openssl python-pexpect @!wheezy @!oneiric @!precise python-pgsql python-pyasn1 - python-pysnmp4 python-sqlobject python-subversion python-tk + python-openssl python-pexpect python-pyasn1 + python-pysnmp4 python-sqlobject python-subversion python-urwid python-xmpp drpython ipython pylint pychecker pyflakes python-beautifulsoup python-chardet python-clientform - python-cups python-kerberos python-mako - python-notify python-pyme python-rpm python-selinux + python-kerberos python-mako + python-pyme python-rpm python-selinux python-setuptools python-simplejson python-sqlite python-sqlitecachec python-urlgrabber @x86 jython @x86 jython-doc; + @office install python-cups python-notify python-tk; # ruby install ruby ruby-dev rubygems rake ruby1.9/ruby1.9.1 @@ -216,14 +211,16 @@ if @devel-full { install @!lenny clang llvm-2.9/llvm llvm-2.9-dev/llvm-dev; # scheme - install gauche-dev gambc mit-scheme-doc chicken-bin - @!lucid @!maverick @!squeeze guile-1.8-dev scheme48 scm sigscheme slib tinyscheme - @!lenny @!sparc scheme2c @!lenny scheme9 + install mit-scheme-doc chicken-bin + @!lucid @!maverick @!squeeze guile-1.8-dev tinyscheme + @!lenny @x86 scheme2c @!lenny scheme9 @x86 stalin - @x86 plt-scheme; + @x86 plt-scheme + @wheezy/sid/oneiric/precise racket racket-doc; # tcl/tk - install tcl tcl-dev tcl8.5 tk tk-dev; + install tcl tcl-dev tcl8.5; + @office install tk tk-dev; # lua install lua5.1 lua5.1-doc luadoc; @@ -232,42 +229,34 @@ if @devel-full { install swig gawk mawk m4; # misc languages - install gfortran gforth gnat gobjc gobjc++ erlang erlang-dev beef - intercal/clc-intercal php5-cli rhino iconx @i386/amd64 sbcl - @!sparc clisp; + install gfortran gforth erlang erlang-dev beef intercal/clc-intercal + php5-cli rhino @x86 sbcl; # AVR toolchain - install @!wheezy gcc-avr binutils-avr gdb-avr avrdude avrdude-doc simulavr - avarice @!wheezy avr-libc avra avrp uisp usbprog - @!lenny @!sparc avrprog; + @office install gcc-avr binutils-avr gdb-avr avrdude avrdude-doc simulavr + avarice avr-libc avra avrp uisp usbprog avrprog; # development libraries install comerr-dev e2fslibs-dev libcap-dev - libattr1-dev libacl1-dev libselinux1-dev libpcre3-dev - 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-x11-prof libghc6-mtl-prof - libghc6-x11-doc libghc6-mtl-doc + libattr1-dev libacl1-dev libselinux1-dev libpcre3-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-mtl-prof 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 - libssl-dev libxml2-dev libxslt1-dev ss-dev mesa-common-dev - uuid-dev libprotobuf-c0-dev libprotobuf-dev - @amd64 ia32-libs libffi-dev libidl-dev libelf-dev libdw-dev - libaudit-dev - libsigc++-dev; + libboost-dev zlib1g-dev libbz2-dev libcurl4-gnutls-dev libexpat1-dev + libglib2.0-dev libgmp3-dev libsasl2-dev libsctp-dev libsqlite3-dev + libssl-dev libxml2-dev libxslt1-dev ss-dev mesa-common-dev uuid-dev + libprotobuf-c0-dev libprotobuf-dev @amd64 ia32-libs libffi-dev + libidl-dev libelf-dev libdw-dev libaudit-dev libsigc++-dev; - # X development libraries - install xorg-dev libgtk2.0-dev libqt4-dev #kdelibs5-dev/kdelibs4-dev - libsdl1.2-dev freeglut3-dev libgl1-mesa-dev - libglu1-mesa-dev - @X @!precise gnome-core-devel - @X libgnome-dev/libgnome2-dev; + @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 + libghc6-x11-dev libghc6-x11-prof libghc6-x11-doc libgtkmm-2.4-dev; # gui tools - install @X glade xutils-dev; + @X install glade xutils-dev; # integrated development environments @X install eclipse monodevelop monodevelop-python @@ -290,9 +279,6 @@ if @devel-full { if @general-use { - # shells - install bash-doc zsh-beta bash-completion zsh-doc zsh-beta-doc bashdb; - # editors install nvi bvi wily @X vim-gnome; @@ -307,16 +293,16 @@ if @general-use { @X wireshark; # web - install w3m links elinks lynx axel curl; + install w3m links elinks lynx curl; # typesetting install groff texlive-full dvi2ps dvipng dvidvi djvulibre-bin -# @X texmacs - requires mlocate @X lyx; # filesystems + install sshfs dosfstools; @!container - install fuse-utils sshfs davfs2 cloop-utils @x86/powerpc fuseext2; + install fuse-utils davfs2 cloop-utils @x86/powerpc fuseext2; # printing install ghostscript psutils @@ -339,15 +325,16 @@ if @general-use { man2html help2man info2man docbook2x txt2man; # spelling - install aspell-en ispell myspell-en-us iamerican wamerican; + install aspell-en ispell myspell-en-us iamerican; # emacs - install @!karmic @!lucid @!maverick tuareg-mode @!karmic @!lucid @!maverick ocaml-mode + install tuareg-mode ocaml-mode @X emacs22-gtk/emacs23-gtk @!X emacs22-nox/emacs23-nox; # math - install graphviz r-recommended euler euler-doc gnuplot gnuplot-doc + install graphviz r-recommended euler euler-doc gnuplot-doc gap lp-solve mathomatic maxima maxima-doc + @!X gnuplot-nox @X gnuplot-x11 @X rocs; @@ -356,14 +343,14 @@ if @general-use { octave3.2-emacsen/octave3.0-emacsen octave3.2-headers/octave3.0-headers; @!lenny - install octave-ad octave-audio octave-benchmark @!wheezy @!ubuntu octave-bim + install octave-ad octave-audio octave-benchmark 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 @!wheezy @!oneiric @!precise octave-integration octave-io octave-irsa + octave-informationtheory octave-io octave-irsa octave-linear-algebra octave-mapping octave-miscellaneous - octave-missing-functions @!wheezy @!oneiric @!precise octave-msh octave-multicore octave-nan + octave-missing-functions 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 @@ -379,29 +366,27 @@ if @general-use { sp tidy xalan; # multimedia - install mplayer vlc @!container festival ffmpeg dvd+rw-tools dvgrab - @!squeeze @!wheezy dvdrip - @!squeeze @!wheezy lame twolame @audio timidity - cdrdao cdparanoia genisoimage sox mp3blaster - @!squeeze @!wheezy x264 mkvtoolnix - vorbis-tools - @X cheese @!alpha mencoder; + install festival ffmpeg dvgrab cdparanoia genisoimage sox mp3blaster + @!squeeze @!wheezy x264 mkvtoolnix vorbis-tools @!alpha mencoder; + @X install mplayer vlc cheese; + @office install dvd+rw-tools lame twolame cdrdao dvdrip wodim; + @audio install timidity; # images - install enblend enfuse hugin-tools; + @x-core install enblend enfuse hugin-tools; # torrents install rtorrent @X amarok; # communication - install mutt alpine tin irssi efax + install mutt alpine tin irssi @squeeze/lucid/maverick bsd-mailx procmail centerim fetchmail nn slrn spamassassin trn4 @lenny @!squeeze @!alpha pine; # utilities - install rdiff dosfstools tofrodos mc wodim socat snmp @!lenny snmp-mibs-downloader + 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 @@ -411,7 +396,7 @@ if @general-use { @x86 syslinux finger fdupes bchunk cowsay 9base libjpeg-progs; # serial - install conserver-client minicom cu; + install minicom cu; # virtualization install @!corn-syrup @!alpha qemu @@ -426,7 +411,7 @@ if @general-use { if @x-core { # base - install xserver-xorg xfonts-base gdm; + install xserver-xorg xfonts-base; # utils install xauth xsel gksu sux; @@ -456,10 +441,8 @@ if @X { ttf-dejavu ttf-opensymbol ttf-freefont; # office - install openoffice.org scribus - gimp xfig dia inkscape imagemagick blender fontforge - xpdf evince gthumb eog djview4; - + install openoffice.org scribus gimp xfig dia inkscape; + # messaging install pidgin pidgin-otr empathy; @@ -469,7 +452,10 @@ if @X { # multimedia install audacity @!ubuntu kstreamripper audacious @!natty @!oneiric lmms k3b - @!lenny ardour; + @!lenny ardour imagemagick blender gthumb eog; + + # documents + install fontforge xpdf evince djview4; # images install hugin; @@ -481,22 +467,20 @@ if @X { install xtrkcad @!lenny freecad pythoncad; # gnome - install @!ubuntu gdm-themes @!oneiric @!precise gnome-core @!oneiric @!precise gnome-office @!precise gnome-themes - gnome-themes-extras rhythmbox gnome-rdp - @!ubuntu gnome-desktop-environment; + install @!precise gnome-themes gnome-themes-extras rhythmbox gnome-rdp; # kde - install @maverick kde-standard @!kdebase kdebase-runtime kdeutils + install @!kdebase kdebase-runtime kdeutils @lenny/squeeze kde-core @!lenny kdebase-workspace; # xfce install xfce4; # electronics - install geda @!ubuntu ktechlab arduino ngspice bristol cl-rlc electric - gerbv gnucap gpsim gsmc gspiceui gtkwave @!ubuntu klogic linsmith + install geda arduino ngspice bristol cl-rlc electric + gerbv gnucap gpsim gsmc gspiceui gtkwave linsmith oregano pcb pcb-gtk qucs tkgate xcircuit xsmc-calc - @!oneiric @!precise eagle kic kicad; + eagle kic kicad; # virtualization install virtualbox-ose; @@ -513,14 +497,13 @@ if @core { remove gnome-games nethack-common; # evil packages - remove pulseaudio avahi-daemon @!natty evolution-data-server @!lenny docky - @!lenny @!squeeze @!wheezy ureadahead lirc joe - mlocate locate pidentd; + remove pulseaudio avahi-daemon evolution-data-server + @ubuntu ureadahead lirc joe mlocate locate pidentd; # useless packages remove winbind @!audio timidity @!lenny modemmanager - libpam-ldap @!lenny libpam-ldapd auditd - isc-dhcp-client/dhcp3-client + libpam-ldap @!lenny libpam-ldapd + @!office isc-dhcp-client/dhcp3-client @!lenny blcr-dkms @!squeeze @!lenny @!wheezy apparmor @!squeeze @!lenny packagekit sn;