* Modifications to existing tasks:

- Replaced talk of "this [meta]package" with "this task", and like
      changes.
    - In l10n tasks, s/-speaking// for consistency.
    - Make all l10n tasks include locales. It's in base, so this is of
      dubious utility, but some had it and some not.
    - Changed short descriptions of basic-desktop and desktop in an attempt
      to clarify how they're different.
    - Added some comments here and there for unresolved issues.
    - Largely rewrote Debian Jr. descriptions.
    - Added menu to desktop task.
    - Rejiggered mail-server, to be a general purpose mail server, not just
      imap.
    - Moved samba-server to file-server, and made that include nfs stuff
      too.
    - Added a print-server task, that also includes samba, along with other
      stuff.
    - Killed debian-dev(el) task, since it does not meet our task criteria
      -- nowhere near 10% of debian users are debian developers (we hope!),
      and probably not enough regular users will use this package to make
      up the difference. This is my own package, so I'm willing to be
      persuaded otherwise, though..
    - Removed misc window managers from the desktop task. It is unnecessary
      to list them there, since anXious will let the user choose.
    - Killed the demo tasks.
    - Went for consistent capitalization of the short descriptions. Just
      capitalize proper names. I'm not sure if I like this effect, we may
      want to capitalize the first word of each description too.
    - Sundry other changes of little note.
  * Replaced several occurrances of "task packages" with "tasks" elsewhere
    in tasksel.
  * Added -a switch, to show all tasks, even empties. Mostly useful before
    we get tasks into the Packages files, for a global overview of how the
  * Added lint check to makedesc.pl -- it will warn at build time
    about tasks that list unavailable packages. This caught several
    references to virtual packages, etc already, that need to be fixed..
  * VERSION in Makefile automatically tracks changelog.

Makefile

@@ -1,7 +1,6 @@
 PROGRAM=tasksel
 TASKDESC=debian-tasks.desc
 DESCDIR=tasks/
-VERSION=1.3
 CC=gcc
 CFLAGS=-g -Wall  #-Os
 DEBUG=1
@@ -12,17 +11,17 @@ else
 DEFS=-DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PROGRAM)\" -DLOCALEDIR=\"/usr/share/locale\" \
      -DTASKDESC=\"$(TASKDESC)\" -DDEBUG
 endif
+VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Version: \(.*\)' | cut -d - -f 1)
 LIBS=-lslang #-lccmalloc -ldl
 OBJS=tasksel.o slangui.o data.o util.o strutl.o
 LANGS=cs de hu ja sv pl ru
 LOCALEDIR=$(DESTDIR)/usr/share/locale
-
 COMPILE = $(CC) $(CFLAGS) $(DEFS) -c
 LINK = $(CC) $(CFLAGS) $(DEFS) -o
 
 all: $(PROGRAM) $(TASKDESC)
 
-$(TASKDESC):
+$(TASKDESC): makedesc.pl $(DESCDIR)/*
 	perl makedesc.pl $(DESCDIR) $(TASKDESC)
 
 %.o: %.c

data.c

@@ -1,4 +1,4 @@
-/* $Id: data.c,v 1.11 2001/05/20 12:05:54 ajt Exp $ */
+/* $Id: data.c,v 1.12 2001/05/23 17:39:54 joeyh Exp $ */
 /* data.c - encapsulates functions for reading a package listing like dpkg's available file
  *          Internally, packages are stored in a binary tree format to faciliate search operations
  */
@@ -309,7 +309,8 @@ static void walktasks(const void *t, const VISIT which, const int depth)
   }
 }
 
-void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs)
+void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs,
+		   unsigned char showempties)
 {
   /* Reads a task definition file, and populates internal data structures
    * with information about the tasks defined therein.
@@ -322,7 +323,10 @@ void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs)
   FILE *f;
   char buf[BUF_SIZE];
   char *task, *shortdesc, *longdesc, *section;
-
+  struct package_t *p;
+  struct task_t *t;
+  char *package;
+  
   f = fopen(fn, "r");
   if (f == NULL) PERROR(fn);
 
@@ -363,11 +367,7 @@ void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs)
       
       /* packages_readlist must be called before this function, so we can
        * tell if any packages are in this task, and ignore it if none are. */
-      if (tasks_find(tasks, task)) {
-        struct package_t *p;
-        struct task_t *t;
-	char *package;
-
+      if (showempties || tasks_find(tasks, task)) {
 	/* This is a fake package to go with the task. I add the task-
 	 * prefix to the package name to ensure that adding this fake
 	 * package stomps on the toes of no real package. */
@@ -384,7 +384,7 @@ void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs)
 	
         t = addtask(tasks, task, "");
         t->task_pkg = p;
-      };
+      }
 
       if (task != NULL) FREE(task);
       if (shortdesc != NULL) FREE(shortdesc);

data.h

@@ -1,4 +1,4 @@
-/* $Id: data.h,v 1.6 2001/05/18 02:02:02 joeyh Exp $ */
+/* $Id: data.h,v 1.7 2001/05/23 17:39:54 joeyh Rel $ */
 #ifndef _DATA_H
 #define _DATA_H
 
@@ -47,7 +47,7 @@ struct tasks_t {
 };
 
 /* Reads in a list of tasks from task description file */
-void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs);
+void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs, unsigned char showempties);
 /* Reads in a list of package and package descriptions from available file */
 void packages_readlist(struct tasks_t *tasks, struct packages_t *packages);
 /* free memory allocated to store packages */

debian/changelog

@@ -1,3 +1,46 @@
+tasksel (1.3-2) unstable; urgency=low
+
+  * Modifications to existing tasks:
+    - Replaced talk of "this [meta]package" with "this task", and like
+      changes.
+    - In l10n tasks, s/-speaking// for consistency.
+    - Make all l10n tasks include locales. It's in base, so this is of
+      dubious utility, but some had it and some not.
+    - Changed short descriptions of basic-desktop and desktop in an attempt
+      to clarify how they're different.
+    - Added some comments here and there for unresolved issues.
+    - Largely rewrote Debian Jr. descriptions.
+    - Added menu to desktop task.
+    - Rejiggered mail-server, to be a general purpose mail server, not just
+      imap.
+    - Moved samba-server to file-server, and made that include nfs stuff
+      too.
+    - Added a print-server task, that also includes samba, along with other
+      stuff.
+    - Killed debian-dev(el) task, since it does not meet our task criteria
+      -- nowhere near 10% of debian users are debian developers (we hope!),
+      and probably not enough regular users will use this package to make
+      up the difference. This is my own package, so I'm willing to be
+      persuaded otherwise, though..
+    - Removed misc window managers from the desktop task. It is unnecessary
+      to list them there, since anXious will let the user choose.
+    - Killed the demo tasks.
+    - Went for consistent capitalization of the short descriptions. Just
+      capitalize proper names. I'm not sure if I like this effect, we may
+      want to capitalize the first word of each description too.
+    - Sundry other changes of little note.
+  * Replaced several occurrances of "task packages" with "tasks" elsewhere
+    in tasksel.
+  * Added -a switch, to show all tasks, even empties. Mostly useful before
+    we get tasks into the Packages files, for a global overview of how the
+    system will eventually look.
+  * Added lint check to makedesc.pl -- it will warn at build time
+    about tasks that list unavailable packages. This caught several
+    references to virtual packages, etc already, that need to be fixed..
+  * VERSION in Makefile automatically tracks this changelog.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 22 May 2001 22:36:00 -0400
+
 tasksel (1.3-1) unstable; urgency=low
 
   * Joey Hess:

makedesc.pl

@@ -24,19 +24,36 @@
 my $dir=shift or die "no directory specified\n";
 my $file=shift or die "no file specified\n";
 
+my %package;
+my $dolint=1;
+{
+	local $/="\n\n";
+	if (! open (AVAIL, "/var/lib/dpkg/available")) {
+		warn "cannot real available file, so disabling lint check\n";
+		$dolint=0;
+	}
+	while (<AVAIL>) {
+		my ($package)=/Package:\s*(.*?)\n/;
+		$package{$package}=1;
+	}
+	close AVAIL;
+}
+
 open (OUT, ">$file") or die ">$file: $!";
 
 use File::Find;
 find(\&processfile, $dir);
 
 sub processfile {
-	return unless /^[-+_.a-z0-9]+$/ and -f $_;
-	open (IN, $_) or die "$_: $!";
+	my $file=$_; # File::Find craziness.
+	return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
+	open (IN, $file) or die "$file: $!";
 	my %fields;
 	my $field="";
 	while (<IN>) {
 		chomp;
 		next if /^\s*#/;
+		s/#.*//;
 
 		if (/^\s/) {
 			$fields{$field}.="\n$_";
@@ -49,6 +66,17 @@ sub processfile {
 	}
 	close IN;
 
+	# Basic lint of the listed packages.
+	# TODO: a better lint would incloude checks for conflicting
+	# packages. Hard tho.
+	if ($dolint) {
+		foreach (split ' ', $fields{packages}) {
+			if (! $package{$_}) {
+				print STDERR "$file: $_ is not a valid package.\n";
+			}
+		}
+	}
+
 	print OUT map { ucfirst($_).": ".$fields{$_}."\n" }
 		qw{task section description};
 	print OUT "\n";

slangui.c

@@ -1,4 +1,4 @@
-/* $Id: slangui.c,v 1.21 2001/05/18 02:02:02 joeyh Exp $ */
+/* $Id: slangui.c,v 1.22 2001/05/23 17:39:54 joeyh Rel $ */
 /* slangui.c - SLang user interface routines */
 /* TODO: the redraw code is a bit broken, also this module is using way too many
  *       global vars */
@@ -72,10 +72,10 @@ static int *_displayhint = NULL;
 static int _displaylines;
 
 struct { char *section, *desc; } sectiondesc[] = {
-  { "user",   "End-user Tools" },
+  { "user",   "End-user" },
   { "server", "Servers" },
   { "devel",  "Development" },
-  { "l10n",   "Localisation" },
+  { "l10n",   "Localization" },
   { "hware",  "Hardware Support" },
   { "misc",   "Miscellaneous" },
   {0}
@@ -431,7 +431,7 @@ int ui_drawscreen(void)
   SLsmg_set_color(DEFAULTOBJ);
   ui_drawbox(CHOOSEROBJ, _chooserinfo.rowoffset - 1, _chooserinfo.coloffset - 1, _chooserinfo.height + 5, _chooserinfo.width + 2, 1);
   ui_title(_chooserinfo.rowoffset - 1, _chooserinfo.coloffset - 1, COLUMNS - 3, 
-	   _("Select task packages to install"));
+	   _("Select tasks to install"));
   
   for (i = _chooserinfo.topindex; i < _chooserinfo.topindex + _chooserinfo.height; i++)
     ui_drawchooseritem(i);

tasks/basic-desktop

@@ -1,18 +1,16 @@
 Task: basic-desktop
 Section: user
-Description: X Window System (core components)
- This metapackage provides (by depending upon) the essential components for a
- standalone workstation running the X Window System.  It provides the X
- libraries, an X server, a set of fonts, and a group of basic X clients and
- utilities.
- .
- Higher level metapackages, such as those for desktop environments, can depend
- on this package and simplify their dependencies.
+Description: X window system
+ This task provides the essential components for a standalone workstation
+ running the X Window System. It provides the X libraries, an X server, a
+ set of fonts, and a group of basic X clients and utilities.
  .
  It should be noted that a package providing x-window-manager and a package
  providing x-terminal-emulator should also be installed to ensure a
  comfortable X experience.
 Packages:
+# FIXME: It would be better if Branden maintained this list by way of a
+# metapackage that we could just list here.
  xfree86-common
  xserver-common
  xserver-xfree86

tasks/c++-dev

@@ -1,8 +1,7 @@
 Task: c++-dev
 Section: devel
-Description: Development in C++
- A metapackage containing dependencies, recommendations and suggestions
- for a complete environment for development of programs in the
+Description: development in C++
+ A complete environment for development of programs in the
  C++ programming language, including:
   o Tools common for C, C++ and Objective C development
   o A C preprocessor
@@ -12,6 +11,7 @@ Description: Development in C++
   o Literate programming tools for C++
   o An extensible C++ compiler
 Packages:
+# FIXME: er, arn't task packages going away?
  task-devel-common
  g++
  cpp

tasks/c-dev

@@ -1,9 +1,8 @@
 Task: c-dev
 Section: devel
-Description: Development in C
- A metapackage containing dependencies and suggestions for a complete
- environment for development of programs in the C programming language,
- including:
+Description: development in C
+ A complete environment for development of programs in the C programming
+ language, including:
   o Tools common for C, C++ and Objective C development
   o A C preprocessor
   o A C compiler

tasks/chinese-s

@@ -1,13 +1,9 @@
 Task: chinese-s
 Section: l10n
-Description: Simplified Chinese environment
- This 'task package' installs programs, data files, fonts, and
+Description: simplified Chinese environment
+ This task installs programs, data files, fonts, and
  documentation that makes it easier to use Debian for
  Simplified-Chinese-related operations.
- .
- Please read /usr/share/doc/task-chinese-s/README for more information.
- .
- (The 's' in the package name stands for 'Simplified Chinese')
 Packages:
   locales
   debian-zh-faq-s
@@ -35,4 +31,3 @@ Packages:
   cxterm-gb
   unifont
   cedictgb
-

tasks/chinese-t

@@ -1,13 +1,9 @@
 Task: chinese-t
 Section: l10n
-Description: Traditional Chinese environment
- This 'task package' installs programs, data files, fonts, and
+Description: traditional Chinese environment
+ This task installs programs, data files, fonts, and
  documentation that makes it easier to use Debian for
  Traditional-Chinese-related operations.
- .
- Please read /usr/share/doc/task-chinese-t/README for more information.
- .
- (The 't' in the package name stands for 'Traditional Chinese')
 Packages:
   locales
   debian-zh-faq-s

tasks/database-server

@@ -1,7 +1,8 @@
 Task: database-server
 Section: server
-Description: PostgreSQL database
- This package installs client and server packages for the PostgreSQL database.
+# HELP: Would "relational database server" be a better short desk?
+Description: SQL database
+ This task selects client and server packages for the PostgreSQL database.
  .
  PostgreSQL is an SQL relational database, offering increasing SQL92
  compliance and some SQL3 features.  It is suitable for use with multi-user

tasks/debian-dev

@@ -1,22 +0,0 @@
-Task: debian-dev
-Section: devel
-Description: Debian package development
- This task package installs packages needed to build Debian packages,
- plus several other packages that while not strictly required, may make
- your life easier. It also contains other information for developers like
- the Debian policy and Debian specific manuals.
-Packages:
-  build-essential
-  cvs-buildpackage
-  lintian
-  debhelper
-  dh-make
-  debmake
-  devscripts 
-  dpkg-dev
-  dput
-  fakeroot
-  debian-policy
-  developers-reference
-  maint-guide
-  gnupg

tasks/demo

@@ -1,11 +0,0 @@
-# Comment.
-Task: demo
-Section: misc
-Description: demo new style task
- This is a demo new style task. It is not intended to ship with debian,
-# Let's make sure a comment can go here.
- really.
-Packages:
- kdebase
- gdm
-

tasks/demo2

@@ -1,11 +0,0 @@
-# Comment.
-Task: demo2
-Section: misc
-Description: another demo new style task
- This is a demo new style task. It is not intended to ship with debian,
-# Let's make sure a comment can go here.
- really.
-Packages:
- kdebase
- gdm
-

tasks/desktop

@@ -1,13 +1,16 @@
 Task: desktop
 Section: user
-Description: X Desktop
- This package provides the basic "desktop" software, including a variety
- of window managers, session managers, file managers and web browsers. It
- incorporates the basic GNOME and KDE desktops, and provides a display
- manager which gives lets the user choose between the two.
+Description: desktop environment
+ This task provides basic "desktop" software, including a variety
+ of session managers, file managers and web browsers. It incorporates
+ both the GNOME and KDE desktops, and provides a display manager
+ which lets the user choose between the two.
 Packages:
-  # task-x-window-system-core
-  wmaker
+  # FIXME: not in a releasable state until it pulls in X too!
+  # task-x-window-system-core (?)
+  # TODO: we really should have kde and gnome meta-packages, which this
+  # task could just pull in, rather than having to track all of kde and
+  # gnome here.
   gnome-session
   gnome-panel
   gnome-control-center
@@ -47,7 +50,5 @@ Packages:
   kiconedit
   ksnapshot
   kruler
-  enlightenment
-  fvwm
-  qvwm
   mozilla
+  menu

tasks/dns-server

@@ -1,12 +1,10 @@
 Task: dns-server
 Section: server
-Source: bind9
-Description: DNS Server
- Installs the BIND DNS server, and related documentation and utility packages.
+Description: DNS server
+ Selects the BIND DNS server, and related documentation and utility packages.
 Packages:
  bind9
  bind9-doc
  dnsutils
  lwresd
  dlint
-

tasks/fortran-dev

@@ -1,14 +1,8 @@
 Task: fortran-dev
 Section: devel
 Description: Fortran development environment
- This package depends on a number of other packages.  When installed
- with all its dependencies it provides a reasonably complete environment
- for Fortran 77 development.  It also suggest a couple of other packages
- which may be of use to Fortran programmers, but does not suggest
- general tools like editors.
- .
- Removing this package will not remove any functionality from your
- system - it exists purely to provide dependencies on other packages.
+ This task provides a reasonably complete environment for Fortran 77
+ development.
 Packages:
  g77
  ftnchek

tasks/games

@@ -1,10 +1,13 @@
 Task: games
 Section: user
-Description: A selection of games
- Selecting this package will install a broad selection of games, from
+Description: games
+ Selecting this task will install a broad selection of games, from
  traditional textual unix games to card games, to fast-paced arcade games.
  It won't install all the games in Debian, but it is a good starting point.
 Packages:
+# TODO: more games can be included now that this is not a task.
+# Please only add very good, complete, classic or well-known games though.
+# It would be good to have some emulators, if any are in main.
  xtris
  bsdgames
  nethack

tasks/german

@@ -1,9 +1,10 @@
 Task: german
 Section: l10n
-Description: German-speaking environment
- This task package installs modifications and documentation in German
- to help German speaking people using Debian.
+Description: German environment
+ This task installs packages and documentation in German
+ to help German speaking people use Debian.
 Packages:
+ locales
  user-de
  manpages-de
  wngerman

tasks/isdn

@@ -1,6 +1,6 @@
 Task: isdn
 Section: hware
-Description: Dialup utilities (ISDN)
+Description: ISDN dialup utilities
  This package installs packages that address special needs of computers
  using a parttime ISDN dialup connection.
 Packages:

tasks/japanese

@@ -1,7 +1,7 @@
 Task: japanese
 Section: l10n
 Description: Japanese environment
- This task package installs packages that makes it easier to use
+ This task installs packages that make it easier to use
  Debian for Japanese-related operations.
 Packages:
  locales

tasks/junior

@@ -1,10 +1,8 @@
 Task: junior
 Section: user
-Description: Install a complete Debian Jr. system
- This will provide a complete Debian Jr. system.  If you would like to
- pick and choose individual components to install instead, then do not
- install this package.  Instead, install the individual junior-* meta
- packages separately.
+Description: Debian Jr.
+ This task will provide a complete Debian Jr. system. Debian Jr. is a
+ collection of Debian packages suitable for children.
 Packages:
  junior-toys
  junior-math

tasks/korean

@@ -1,7 +1,7 @@
 Task: korean
 Section: l10n
-Description: Korean-speaking environment
- This task package installs programs, data files, fonts, and documentations
+Description: Korean environment
+ This task installs programs, data files, fonts, and documentations
  that make it easier to use Debian for Korean-related operations.
 Packages:
  locales

tasks/laptop

@@ -1,13 +1,9 @@
 Task: laptop
 Section: hware
-Description: A selection of tools for laptop users
+Description: laptop system
  This is a collection of tools that laptop users will expect to find on a
  system.
- .
- Power management
- PCMCIA
- cron control
-Pacakges:
+Packages:
  apmd
  pcmcia-cs
  anacron
@@ -15,3 +11,4 @@ Pacakges:
  irda-tools
  irda-common
  toshutils
+ noflushd

tasks/mail-server

@@ -1,8 +1,14 @@
 Task: mail-server
 Section: server
-Description: IMAP Server
- This is a server for the IMAP protocol.  IMAP allows you to keep your
- mail folders on a central server and access them from multiple locations.
+Description: mail server
+ This task selects a variety of package useful for a general purpose mail
+ server system.
 Packages:
+ qpopper # HELP: What's a good pop server?
+ mailx
+ # perhaps it should include a real mail reader too, but beware holy wars..
+ exim
+ procmail
+ mailagent
  uw-imapd
- imap-server
+ # HELP: what about some webmail thing?

tasks/modem

@@ -1,8 +1,8 @@
 Task: modem
 Section: hware
-Description: Dialup utilities
- This package installs packages that address special needs of computers
- using a parttime dialup connection.
+Description: dialup utilities
+ This task selects packages that address special needs of computers
+ using a part-time dialup connection.
 Packages:
  anacron
  diald

tasks/news-server

@@ -1,12 +1,15 @@
 Task: news-server
 Section: server
-Description: USENET News Server
- This package will select the preferred version of the INN news server
+# HELP: is runnnig a full usenet news server something enough people
+# to warrant this task?
+# HELP: should usenet really be all caps? (if so, what does it expand to?)
+Description: usenet news server
+ This task selects select the preferred version of the INN news server
  software for new Debian installations.
  .
  You do not need this package if you merely wish to read news from an
  existing server, just select the news reader program you desire and it
- will pull in any required pieces.  Only use this package if you intend
+ will pull in any required pieces. Only use this task if you intend
  to operate a server.
 Packages:
  inn2

tasks/objc-dev

@@ -1,9 +1,9 @@
 Task: objc-dev
 Section: devel
-Description: Development in Objective C
- A metapackage containing dependencies and suggestions for a complete
- environment for development of programs in the Objective C programming
- language, including:
+# HELP: So, do anywhere near 10% of debian users use objc? Doubtful.
+Description: development in Objective C
+ A complete environment for development of programs in the Objective C
+ programming language, including:
   o Tools common for C, C++ and Objective C development
   o A C preprocessor
   o An Objective C compiler and library

tasks/polish

@@ -1,9 +1,10 @@
 Task: polish
 Section: l10n
-Description: Polish-speaking environment
- This task package installs modifications and documentation in Polish
- to help Polish speaking people using Debian.
+Description: Polish environment
+ This task installs packages and documentation in Polish
+ to help Polish speaking people use Debian.
 Packages:
+ locales
  manpages-pl
  fonty
  konwert

tasks/print-server

@@ -0,0 +1,14 @@
+Task: print-server
+Section: server
+Description: print server
+ This task sets up your system to be a print server. It includes
+ the samba server for Windows OS/2 or DOS clients.
+Packages:
+ samba
+ samba-doc
+ smbclient
+ swat
+ smbfs
+ lpr
+ magicfilter
+ gs

tasks/python-dev

@@ -1,13 +1,12 @@
 Task: python-dev
 Section: devel
-Description: Full Python development environment
- This package provides almost all of the Debian-packaged Python tools
+Description: Python development
+ Almost all of the Debian-packaged Python tools
  and extensions, for developing scripts and simple or complex applications
  in Python.
- .
- Please see task-python for additional information.
 Packages:
- # task-python
+ python-base
+ python-doc
  ddd
  dpkg-python
  gadfly

tasks/russian

@@ -1,11 +1,10 @@
 Task: russian
 Section: l10n
-Description: Russian-speaking environment
- This task package installs modifications and documentation in russian
- to help russian speaking people using Debian.
- .
- This package doesn't depend on packages that depend on X.
+Description: Russian environment
+ This task installs modifications and documentation in Russian
+ to help Russian speaking people using Debian.
 Packages:
+ locales
  console-cyrillic
  manpages-ru
  irussian

tasks/science

@@ -1,10 +1,9 @@
 Task: science
 Section: user
-Description: Packages for numerical computing, data analysis and visualization
- The task-science meta-package contains dependencies on packages which are
- suitable for scientific work. Under a fairly loose definition of
- 'scientific', this includes numerical analysis and computing, statistical
- data analysis as well as visualization.
+Description: scientific applications
+ This task selects packages which are suitable for scientific work. Under a
+ fairly loose definition of 'scientific', this includes numerical analysis
+ and computing, statistical data analysis as well as visualization.
 Packages:
  gnuplot
  gperiodic

tasks/tcltk-dev

@@ -1,9 +1,8 @@
 Task: tcltk-dev
 Section: devel
-Description: Developing Tcl/Tk applications
- A metapackage containing dependencies for packages commonly used
- in developing applications using the Tcl language and Tk Toolkit.
- It includes:
+Description: developing Tcl/Tk applications
+ Packages commonly used in developing applications using the Tcl language
+ and Tk Toolkit. It includes:
   o Script-level manpages
   o C-level manpages
   o C headers and libraries

tasks/tex

@@ -1,7 +1,7 @@
 Task: tex
 Section: misc
 Description: TeX/LaTeX environment
- metapackage for a complete TeX/LaTeX environment
+ a complete TeX/LaTeX environment
 Packages:
  bibindex
  bibtool

tasksel.c

@@ -1,4 +1,4 @@
-/* $Id: tasksel.c,v 1.11 2001/05/18 02:02:02 joeyh Exp $ */
+/* $Id: tasksel.c,v 1.12 2001/05/23 17:39:54 joeyh Exp $ */
 #include "tasksel.h"
 
 #include <stdio.h>
@@ -35,7 +35,9 @@ void help(void)
   fprintf(stderr, "\t%s\n", _("-r -- install all required-priority packages"));
   fprintf(stderr, "\t%s\n", _("-i -- install all important-priority packages"));
   fprintf(stderr, "\t%s\n", _("-s -- install all standard-priority packages"));
-  fprintf(stderr, "\t%s\n\n", _("-n -- don't show UI; use with -r or -i usually"));
+  fprintf(stderr, "\t%s\n", _("-n -- don't show UI; use with -r or -i usually"));
+  fprintf(stderr, "\t%s\n", _("-a -- show all tasks, even those with no packages in them"));
+  fprintf(stderr, "\n");
   exit(0);
 }
 
@@ -123,6 +125,7 @@ int main(int argc, char * const argv[])
   int i, c, r = 0;
   unsigned char testmode = 0, queueinstalls = 0, installreqd = 0;
   unsigned char installimp = 0, installstd = 0, noninteractive = 0;
+  unsigned char showempties = 0;
   struct packages_t packages;
   struct tasks_t tasks;
   struct package_t **pkglist;
@@ -135,7 +138,7 @@ int main(int argc, char * const argv[])
   textdomain(PACKAGE);
   
   while (1) {
-    c = getopt(argc, argv, "tqrins");
+    c = getopt(argc, argv, "tqrinsa");
     if (c == -1) break;
 
     switch (c) {
@@ -145,6 +148,7 @@ int main(int argc, char * const argv[])
       case 'i': installimp = 1; break;
       case 's': installstd = 1; break;
       case 'n': noninteractive = 1; break;
+      case 'a': showempties = 1; break;
       default: help();
     }
   }
@@ -157,10 +161,10 @@ int main(int argc, char * const argv[])
   packages_readlist(&tasks, &packages);
   
   /* TODO: should probably read in all files in a directory. */
-  taskfile_read(TASKDESC, &tasks, &packages);
+  taskfile_read(TASKDESC, &tasks, &packages, showempties);
 
   if (tasks.count == 0) {
-    fprintf(stderr, _("No task packages found on this system.\nDid you update your available file?"));
+    fprintf(stderr, _("No tasks found on this system.\nDid you update your available file?"));
     return 255;
   }
   

tasksel.pod

@@ -1,6 +1,6 @@
 =head1 NAME 
 
-tasksel - a user interface for installing task packages
+tasksel - a user interface for installing tasks
 
 =head1 SYNOPSIS