[23613] in Source-Commits
/svn/athena r23247 - in trunk/debathena: . meta meta/cluster meta/cluster-software meta/extra-software meta/extra-software-nox scripts/installer
daemon@ATHENA.MIT.EDU (price@MIT.EDU)
Sat Nov 22 00:24:19 2008
Date: Sat, 22 Nov 2008 00:23:19 -0500 (EST)
From: price@MIT.EDU
Message-Id: <200811220523.AAA17442@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: price
Date: 2008-11-22 00:23:17 -0500 (Sat, 22 Nov 2008)
New Revision: 23247
Added:
trunk/debathena/meta/extra-software-nox/
trunk/debathena/meta/extra-software-nox/extra-software-nox.equivs
trunk/debathena/meta/extra-software/
trunk/debathena/meta/extra-software/extra-software.equivs
Removed:
trunk/debathena/meta/cluster-software/debathena-cluster-software.equivs
Modified:
trunk/debathena/NOTES
trunk/debathena/meta/cluster/debathena-cluster.equivs
trunk/debathena/scripts/installer/install-athena10.sh
Log:
-cluster-software -> -extra-software{,-nox}
Per discussion on athena10@, renamed debathena-cluster-software
to debathena-extra-software and split out debathena-extra-software-nox
as a subset metapackage.
Modified: trunk/debathena/NOTES
===================================================================
--- trunk/debathena/NOTES 2008-11-21 00:19:26 UTC (rev 23246)
+++ trunk/debathena/NOTES 2008-11-22 05:23:17 UTC (rev 23247)
@@ -172,13 +172,13 @@
X login experience using Athena home directories. Still in
development.
-* cluster-software: Provides a set of Debian packages common to
- cluster machines. The resulting software set is rather large, and
- thus may not be desirable to all workstation configurations. Only
- stock Debian packages belong in this metapackage; do not add
- other Debathena packages to it.
+* extra-software: Implies a set of Debian packages common to cluster
+ machines and typical workstations. The resulting software set is
+ rather large, and thus may not be desirable to all workstation
+ configurations. Only stock Debian packages belong in this
+ metapackage; do not add other Debathena packages to it.
-* cluster: Implies workstation and cluster-software. Also contains
+* cluster: Implies workstation and extra-software. Also contains
configurations for self-maintenance of machines (unattended updates,
cleanups between logins, etc.).
Modified: trunk/debathena/meta/cluster/debathena-cluster.equivs
===================================================================
--- trunk/debathena/meta/cluster/debathena-cluster.equivs 2008-11-21 00:19:26 UTC (rev 23246)
+++ trunk/debathena/meta/cluster/debathena-cluster.equivs 2008-11-22 05:23:17 UTC (rev 23247)
@@ -3,11 +3,11 @@
Standards-Version: 3.6.2
Package: debathena-cluster
-Version: 0.8.3
+Version: 0.8.4
Maintainer: Debian-Athena Project <debathena@mit.edu>
Depends: debathena-workstation,
debathena-build-depends,
- debathena-cluster-software,
+ debathena-extra-software,
debathena-cluster-login-config,
debathena-clusterinfo,
debathena-dns-config,
Deleted: trunk/debathena/meta/cluster-software/debathena-cluster-software.equivs
Added: trunk/debathena/meta/extra-software/extra-software.equivs
===================================================================
--- trunk/debathena/meta/extra-software/extra-software.equivs 2008-11-21 00:19:26 UTC (rev 23246)
+++ trunk/debathena/meta/extra-software/extra-software.equivs 2008-11-22 05:23:17 UTC (rev 23247)
@@ -0,0 +1,25 @@
+Section: debathena/base
+Priority: extra
+Standards-Version: 3.8.0
+
+Package: debathena-extra-software
+Version: 0.6
+Maintainer: Debian-Athena Project <debathena@mit.edu>
+Conflicts: debathena-cluster-software
+Replaces: debathena-cluster-software
+Depends: debathena-extra-software-nox,
+ gnome-devel,
+ pidgin | gaim, pidgin-encryption | gaim-encryption,
+ gv,
+ openoffice.org,
+ thunderbird | mozilla-thunderbird | icedove,
+ gnuplot,
+ eclipse,
+Copyright: ../common/copyright
+Readme: ../common/README-meta.in
+Description: Athena auxiliary software
+ This package pulls in miscellaneous non-Athena-specific software
+ for a fully-stocked Athena workstation.
+ .
+ Graphical applications are included; debathena-extra-software-nox
+ is the non-graphical subset.
Copied: trunk/debathena/meta/extra-software-nox/extra-software-nox.equivs (from rev 23246, trunk/debathena/meta/cluster-software/debathena-cluster-software.equivs)
===================================================================
--- trunk/debathena/meta/cluster-software/debathena-cluster-software.equivs 2008-11-21 00:19:26 UTC (rev 23246)
+++ trunk/debathena/meta/extra-software-nox/extra-software-nox.equivs 2008-11-22 05:23:17 UTC (rev 23247)
@@ -0,0 +1,29 @@
+Section: debathena/base
+Priority: extra
+Standards-Version: 3.8.0
+
+Package: debathena-extra-software-nox
+Version: 0.6
+Maintainer: Debian-Athena Project <debathena@mit.edu>
+Depends: build-essential,
+ enscript, psutils, vgrind,
+ emacs, emacs-intl-fonts,
+ athena-jot,
+ hesiod,
+ ispell, iamerican,
+ aspell, aspell-en,
+ libsasl2-modules-gssapi-mit | libsasl2-gssapi-mit,
+ texlive-full | tetex-extra,
+ krb5-clients,
+ drscheme,
+ inn2-inews,
+ screen,
+ lynx
+Recommends: ckermit,
+ sun-java6-jdk | sun-java5-jdk,
+ x3270
+Copyright: ../common/copyright
+Readme: ../common/README-meta.in
+Description: Athena auxiliary software, non-graphical
+ This package pulls in miscellaneous non-Athena-specific software
+ for a fully-stocked non-graphical Athena machine, like a dialup.
Modified: trunk/debathena/scripts/installer/install-athena10.sh
===================================================================
--- trunk/debathena/scripts/installer/install-athena10.sh 2008-11-21 00:19:26 UTC (rev 23246)
+++ trunk/debathena/scripts/installer/install-athena10.sh 2008-11-22 05:23:17 UTC (rev 23247)
@@ -61,12 +61,11 @@
fi
csoft=no
-echo "The cluster-software package installs a standard set of software"
+echo "The extra-software package installs a standard set of software"
echo "determined to be of interest to MIT users, such as LaTeX. It is pretty"
-echo "big (several gigabytes, possibly more). It does not turn your machine"
-echo "into a cluster machine; it is only a standard software set."
+echo "big (several gigabytes, possibly more)."
echo ""
-ask "Do you want the cluster-software package [y/N]? " n
+ask "Do you want the extra-software package [y/N]? " n
if [ y = "$answer" ]; then
csoft=yes
fi
@@ -74,7 +73,7 @@
echo "A summary of your choices:"
echo " Category: $category"
echo " Debian development package: $dev"
-echo " Cluster software package: $csoft"
+echo " Extra-software package: $csoft"
echo ""
output "Press return to begin or control-C to abort"
read dummy
@@ -157,6 +156,6 @@
# Use the default front end and allow questions to be asked; otherwise
# Java will fail to install since it has to present its license.
if [ yes = "$csoft" ]; then
- output "Installing debathena-cluster-software"
- DEBIAN_PRIORITY=critical aptitude -y install debathena-cluster-software
+ output "Installing debathena-extra-software"
+ DEBIAN_PRIORITY=critical aptitude -y install debathena-extra-software
fi
