Add stretch as a supported version and change packages to reflect current repo status

diff --git a/nodes.ia b/nodes.ia
index 99fca2f..a1fa2ad 100644 (file)
--- a/nodes.ia
+++ b/nodes.ia
@@ -43,8 +43,8 @@ profiles csclub server machine amd64 general-use stretch;
 # @acesulfame-potassium
 # profiles csclub server machine i386 general-use squeeze;
 
-@sid
-profiles csclub server container amd64 general-use sid;
+# @sid
+# profiles csclub server container amd64 general-use sid;
 
 @high-fructose-corn-syrup
 profiles csclub server machine amd64 general-use jessie;
@@ -155,5 +155,5 @@ profiles auth-core nfs-core;
 @quantal/raring/saucy/trusty
 profiles ubuntu;
 
-@squeeze/wheezy/jessie/sid
+@squeeze/wheezy/jessie/stretch/sid
 profiles debian;

diff --git a/packages.ia b/packages.ia
index 8732aa4..c72bdfd 100644 (file)
--- a/packages.ia
+++ b/packages.ia
@@ -24,7 +24,8 @@ if @core {
 
     # network
     install iputils-ping iputils-arping traceroute telnet
-            iproute ethtool dnsutils whois wget netcat-openbsd netcat6
+            iproute ethtool dnsutils whois wget netcat-openbsd
+            @!stretch netcat6
             @!container ntp vlan bridge-utils tcpdump tshark
             ftp tftp;
 
@@ -61,7 +62,7 @@ if @machine {
             @!sparc @!mips @!alpha @!mipsel kexec-tools @x86 vbetool fbset
             @x86 read-edid;
 
-    @amd64 install linux-image-generic;
+    @amd64 install @stretch linux-image-amd64 @!stretch linux-image-generic;
     @i386 install linux-image-686/linux-image;
     @sparc install @!nosmp linux-image-sparc64-smp @nosmp linux-image-sparc64;
     @powerpc install linux-image-powerpc;
@@ -75,7 +76,7 @@ if @container {
 };
 
 if @auth-core {
-    install nslcd libnss-ldapd ldap-utils libpam-krb4 krb5-user
+    install nslcd libnss-ldapd ldap-utils libpam-krb5 krb5-user
     ldapvi libsasl2-modules-gssapi-mit;
 
     @office
@@ -126,7 +127,7 @@ if @devel-full {
             @x86 ltrace;
 
     # profiling
-    install libc6-prof/libc6.1-prof;
+    install @!debian libc6-prof/libc6.1-prof;
 
     # assembly
     @x86 install bin86 nasm yasm;
@@ -137,7 +138,7 @@ if @devel-full {
 
     # build systems
     install make-doc ccache ant ant-optional scons qt4-qmake
-            autogen autoconf-doc autoconf2.13 automake1.9
+            autogen autoconf-doc autoconf2.13
             autotools-dev autoproject kbuild;
 
     # version control
@@ -215,7 +216,8 @@ if @devel-full {
     # scheme
     install mit-scheme-doc chicken-bin
             @!lucid @!maverick @!squeeze guile-1.8-dev tinyscheme
-            @x86 scheme2c scheme9
+            @x86 @!stretch scheme2c
+            @x86 scheme9
             @x86 stalin
             @x86 plt-scheme
             @wheezy/sid racket racket-doc;
@@ -241,18 +243,20 @@ if @devel-full {
     # development libraries
     install comerr-dev e2fslibs-dev libcap-dev
             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
-           libghc-mtl-dev/libghc6-mtl-dev
-           libghc-mtl-prof/libghc6-mtl-prof
-           libghc-mtl-doc/libghc6-mtl-doc
-           libghc-network-dev/libghc6-network-dev
-           libghc-parsec3-dev/libghc6-parsec-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
-           libffi-dev libidl-dev libelf-dev libdw-dev libaudit-dev
+            libapt-pkg-dev linux-libc-dev libkrb5-dev
+            @!stretch libgnutls-dev
+            @stretch libgnutls28-dev
+            libreadline6-dev/libreadline5-dev libncurses5-dev libncursesw5-dev
+            libghc-mtl-dev/libghc6-mtl-dev
+            libghc-mtl-prof/libghc6-mtl-prof
+            libghc-mtl-doc/libghc6-mtl-doc
+            libghc-network-dev/libghc6-network-dev
+            libghc-parsec3-dev/libghc6-parsec-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
+            libffi-dev libidl-dev libelf-dev libdw-dev libaudit-dev
 
     # more development libraries (floating point + math)
     @install libgmp-dev libmpfr-dev libmpc-dev libfplll-dev;
@@ -299,8 +303,9 @@ if @general-use {
 
     # network
     install ipset ipcalc iftop nmap openipmi @x86 ipmitool cdpr lksctp-tools
-            iptables ebtables arptables tsocks freeipmi-tools
+            iptables ebtables arptables freeipmi-tools
             lftp ncftp axel
+            @!stretch tsocks
             @X wireshark;
 
     # web
@@ -342,7 +347,7 @@ if @general-use {
             man2html help2man info2man docbook2x txt2man;
 
     # spelling
-    install aspell-en ispell myspell-en-us iamerican;
+    install aspell-en ispell hunspell-en-us hunspell-en-ca iamerican;
 
     # emacs
     install tuareg-mode ocaml-mode
@@ -353,34 +358,35 @@ if @general-use {
             gap lp-solve mathomatic maxima maxima-doc fplll-tools
             @!X gnuplot-nox
             @X gnuplot-x11
-           @X rocs;
+      @X rocs;
 
     # octave
     install octave/octave3.2/octave3.0
             octave-doc/octave3.2-doc/octave3.0-doc;
 
-    @!quantal @!trusty @!jessie
+    @!quantal @!trusty @!jessie @!stretch
     install octave3.2-emacsen/octave3.0-emacsen
-           octave3.2-headers/octave3.0-headers;
+      octave3.2-headers/octave3.0-headers;
 
+    @!stretch
     install octave-audio octave-communications-common
-           octave-communications octave-control octave-data-smoothing
-           octave-econometrics octave-epstk octave-financial
-           octave-fpl octave-ga octave-general octave-gsl octave-image
-           octave-io octave-linear-algebra octave-miscellaneous
-           octave-missing-functions octave-nan octave-nurbs
-           octave-ocs octave-octcdf octave-odepkg octave-optim
-           octave-optiminterp octave-pkg-dev
-           octave-secs2d octave-signal octave-specfun
-           octave-splines octave-statistics octave-strings octave-struct
-           octave-symbolic octave-tsa octave-vrml octave-zenity
-           octave-pfstools;
-
-    @!jessie
+      octave-communications octave-control octave-data-smoothing
+      octave-econometrics octave-epstk octave-financial
+      octave-fpl octave-ga octave-general octave-gsl octave-image
+      octave-io octave-linear-algebra octave-miscellaneous
+      octave-missing-functions octave-nan octave-nurbs
+      octave-ocs octave-octcdf octave-odepkg octave-optim
+      octave-optiminterp octave-pkg-dev
+      octave-secs2d octave-signal octave-specfun
+      octave-splines octave-statistics octave-strings octave-struct
+      octave-symbolic octave-tsa octave-vrml octave-zenity
+      octave-pfstools;
+
+    @!jessie @!stretch
     install octave-benchmark octave-mapping 
             octave-octgpr octave-plot;
 
-    @!quantal @!jessie @!trusty
+    @!quantal @!jessie @!trusty @!stretch
     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
@@ -407,14 +413,16 @@ if @general-use {
 
     # communication
     install mutt alpine tin irssi
-            @squeezebsd-mailx procmail centerim fetchmail
-            slrn spamassassin;
+            @squeezebsd-mailx procmail fetchmail
+            slrn spamassassin
+            @ubuntu centerim;
 
     # utilities
-    install rdiff tofrodos mc socat snmp snmp-mibs-downloader
+    install rdiff tofrodos mc socat snmp @!stretch snmp-mibs-downloader
             @!lucid @!maverick busybox-static/busybox
             @lucid/maverick busybox-static most
-            bonnie++ latencytop time bsdmainutils dctrl-tools @!quantal @!trusty ddrescue
+            bonnie++ latencytop time bsdmainutils dctrl-tools
+            @!quantal @!trusty @!stretch 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
@@ -543,16 +551,16 @@ if @core {
     # useless packages
     remove winbind @!audio timidity modemmanager
            libpam-ldapd/libpam-ldap
-          @!office isc-dhcp-client/dhcp3-client
-           blcr-dkms
+     @!office isc-dhcp-client/dhcp3-client
+           @!stretch blcr-dkms
            @!squeeze @!wheezy apparmor @!squeeze packagekit
-          sn;
+     sn;
 
     # X-only packages
     @!x-core remove fam gamin @!jessie pidgin dbus dbus-x11 xfonts-100dpi;
 
     # full X-only packages
-    @!X remove consolekit @!alpha policykit-1 gvfs @!alpha udisks;
+    @!X remove consolekit @!alpha policykit-1 gvfs @!alpha @!stretch udisks;
 
     # static network only
     remove network-manager-pptp