From 5769f6988040272d44974dabceb3852df7e7e53a Mon Sep 17 00:00:00 2001 From: Jordan Pryde Date: Wed, 11 Nov 2015 14:01:35 -0500 Subject: [PATCH] Apply s455wang patch: 0003-update-lists-removing-nonexistent-packages.patch --- nodes.ia | 22 +++++++++++----------- packages.ia | 39 +++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/nodes.ia b/nodes.ia index 0e21ce3..99fca2f 100644 --- a/nodes.ia +++ b/nodes.ia @@ -9,7 +9,7 @@ profiles csclub office machine amd64 trusty; profiles csclub office machine amd64 trusty; @natural-flavours -profiles csclub office machine amd64 trusty; +profiles csclub office machine amd64 trusty nvidia; @bit-shifter profiles csclub office machine amd64 trusty webcam nvidia; @@ -34,11 +34,11 @@ profiles csclub server machine amd64 general-use stretch; # @ascorbic-acid # profiles csclub server machine sparc general-use squeeze nosmp; -@potassium-citrate -profiles csclub server machine alpha lenny; +# @potassium-citrate +# profiles csclub server machine alpha lenny; -@denardo -profiles csclub server machine sparc general-use squeeze; +# @denardo +# profiles csclub server machine sparc general-use squeeze; # @acesulfame-potassium # profiles csclub server machine i386 general-use squeeze; @@ -63,11 +63,11 @@ profiles csclub server machine amd64 wheezy; @sodium-benzoate profiles csclub server machine amd64 wheezy; -@ginseng -profiles csclub server machine amd64 wheezy; +# @ginseng +# profiles csclub server machine amd64 wheezy; -@artificial-flavours -profiles csclub server machine i386 wheezy mta; +# @artificial-flavours +# profiles csclub server machine i386 wheezy mta; @mail profiles csclub server container amd64 wheezy mta; @@ -127,8 +127,8 @@ profiles csclub server container amd64 jessie; # Non-CSC -@skynet -profiles server machine armel squeeze general-small; +# @skynet +# profiles server machine armel squeeze general-small; # Miscellaneous diff --git a/packages.ia b/packages.ia index 24ce98d..8732aa4 100644 --- a/packages.ia +++ b/packages.ia @@ -3,8 +3,8 @@ if @core { # shells - install bash zsh dash ksh tcsh csh rc bash-doc zsh-beta bash-completion - zsh-doc zsh-beta-doc bashdb; + install bash zsh dash ksh tcsh csh rc bash-doc bash-completion + zsh-doc bashdb; # editors install ed vim nano; @@ -54,13 +54,14 @@ if @core { }; # physical machine (non virtual server) +# hwinfo doesn't exist for trusty if @machine { 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; - @amd64 install linux-image-amd64/linux-image; + @amd64 install 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; @@ -74,11 +75,11 @@ if @container { }; if @auth-core { - install nslcd libnss-ldapd ldap-utils libpam-krb5 krb5-user + install nslcd libnss-ldapd ldap-utils libpam-krb4 krb5-user ldapvi libsasl2-modules-gssapi-mit; @office - install nscd; + remove nscd; # "kill it with fire" - jxpyrde et al. @csclub install libpam-csc; @@ -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 - automake1.9-doc autotools-dev autoproject kbuild; + autotools-dev autoproject kbuild; # version control install git-core git-email git-cvs git-svn git-arch git-doc @@ -150,7 +151,7 @@ if @devel-full { @office install tkdiff; # debian - install debhelper dh-make dh-make-perl dh-buildinfo dbs cdbs dpatch + install debhelper dh-make dh-make-perl dh-buildinfo cdbs dpatch kernel-package lintian alien po-debconf pbuilder dpkg-repack; # i18n @@ -252,10 +253,9 @@ if @devel-full { 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 - libsigc++-dev; # more development libraries (floating point + math) - install libgmp-dev libmpfr-dev libmpc-dev libfplll-dev; + @install libgmp-dev libmpfr-dev libmpc-dev libfplll-dev; @x-core install xorg-dev libgtk2.0-dev libqt4-dev @@ -328,7 +328,7 @@ if @general-use { # databases install sqlite3 sqlite3-doc postgresql-client mysql-client - @!jessie db4.7-util/db4.8-util @jessie db5.1-util/db5.3-util; + @jessie db5.1-util/db5.3-util; # compression install unzip unrar sharutils cabextract p7zip p7zip-full p7zip-rar @@ -377,8 +377,8 @@ if @general-use { octave-pfstools; @!jessie - install octave-benchmark octave-fixed octave-mapping octave-mnet - octave-octgpr octave-plot octave-plplot; + install octave-benchmark octave-mapping + octave-octgpr octave-plot; @!quantal @!jessie @!trusty install octave-ad octave-combinatorics octave-fixed octave-ftp octave-ident @@ -408,13 +408,12 @@ if @general-use { # communication install mutt alpine tin irssi @squeezebsd-mailx procmail centerim fetchmail - slrn spamassassin - @!squeeze @!alpha @!wheezy @!jessie pine; + slrn spamassassin; # utilities install rdiff tofrodos mc socat snmp snmp-mibs-downloader @!lucid @!maverick busybox-static/busybox - @lucid/maverick busybox-static uboot-mkimage most + @lucid/maverick busybox-static most 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 @@ -441,7 +440,7 @@ if @x-core { install xserver-xorg xfonts-base; # utils - install xauth xsel gksu sux; + install xauth xsel gksu; # terminal emulators install xterm rxvt rxvt-unicode-256color gnome-terminal; @@ -460,7 +459,7 @@ if @X { # window managers install xmonad libghc-xmonad-contrib-dev stumpwm wmii awesome openbox - openbox-themes openbox-gnome-session openbox-kde-session i3-wm; + openbox-gnome-session openbox-kde-session i3-wm; # widgets install xmobar; @@ -485,7 +484,7 @@ if @X { midori flashplugin-nonfree/flashplugin-installer; # multimedia - install audacity kstreamripper audacious lmms k3b + install audacity audacious lmms k3b ardour imagemagick blender gthumb eog feh; # documents @@ -550,7 +549,7 @@ if @core { sn; # X-only packages - @!x-core remove fam gamin @!jessie hal pidgin dbus dbus-x11 xfonts-100dpi; + @!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; @@ -561,6 +560,6 @@ if @core { wpasupplicant; }; -@nvidia install nvidia-driver nvidia-settings; +@nvidia install nvidia-settings nvidia-current; @webcam install motion;