Browse Source

- Fix memory allocation bug when do a fake task- package

- Port most of the interesting tasks to the tasks file.
- Fix makedesc.pl to cope with +'s in a task name (c++-dev)
tags/debian_version_1_4
Anthony Towns 20 years ago
parent
commit
14da2b507e
32 changed files with 666 additions and 24 deletions
  1. +19
    -8
      data.c
  2. +21
    -15
      debian/changelog
  3. +1
    -1
      makedesc.pl
  4. +25
    -0
      tasks/basic-desktop
  5. +20
    -0
      tasks/c++-dev
  6. +26
    -0
      tasks/c-dev
  7. +38
    -0
      tasks/chinese-s
  8. +37
    -0
      tasks/chinese-t
  9. +16
    -0
      tasks/database-server
  10. +22
    -0
      tasks/debian-dev
  11. +53
    -0
      tasks/desktop
  12. +12
    -0
      tasks/dns-server
  13. +17
    -0
      tasks/fortran-dev
  14. +17
    -0
      tasks/games
  15. +15
    -0
      tasks/german
  16. +9
    -0
      tasks/isdn
  17. +36
    -0
      tasks/japanese
  18. +15
    -0
      tasks/junior
  19. +16
    -0
      tasks/korean
  20. +17
    -0
      tasks/laptop
  21. +8
    -0
      tasks/mail-server
  22. +19
    -0
      tasks/modem
  23. +12
    -0
      tasks/news-server
  24. +20
    -0
      tasks/objc-dev
  25. +18
    -0
      tasks/polish
  26. +56
    -0
      tasks/python-dev
  27. +16
    -0
      tasks/russian
  28. +14
    -0
      tasks/samba-server
  29. +17
    -0
      tasks/science
  30. +16
    -0
      tasks/spanish
  31. +17
    -0
      tasks/tcltk-dev
  32. +21
    -0
      tasks/tex

+ 19
- 8
data.c View File

@@ -1,4 +1,4 @@
/* $Id: data.c,v 1.10 2001/05/18 02:02:02 joeyh Exp $ */
/* $Id: data.c,v 1.11 2001/05/20 12:05:54 ajt 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
*/
@@ -216,9 +216,18 @@ static struct package_t *addpackage(
if (recommendsdesc) node->recommendscount = splitlinkdesc(recommendsdesc, &node->recommends);
if (suggestsdesc) node->suggestscount = splitlinkdesc(suggestsdesc, &node->suggests);
p = tsearch((void *)node, &pkgs->packages, packagecompare);
p = tsearch(node, &pkgs->packages, packagecompare);
VERIFY(p != NULL);
pkgs->count++;
if (*(struct package_t**)p == node) {
pkgs->count++;
} else {
/* hmmm. this happens when there's a task- package and an entry in
* the task file. what to do about it? I *think* what's happening is
* the task- package is being replaced by the entry in the file, which
* would mean **p is getting leaked right now. XXX
*/
fprintf(stderr, "W: duplicate task info for %s\n", node->name);
}

return node;
}
@@ -314,7 +323,9 @@ void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs)
char buf[BUF_SIZE];
char *task, *shortdesc, *longdesc, *section;

if ((f = fopen(fn, "r")) == NULL) PERROR(fn);
f = fopen(fn, "r");
if (f == NULL) PERROR(fn);

while (!feof(f)) {
fgets(buf, BUF_SIZE, f);
CHOMP(buf);
@@ -364,8 +375,8 @@ void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs)
* should include description and section fields and not need an
* associated package. */
package = MALLOC(strlen(task) + 6);
package = STRDUP("task-");
strcat(package, task);
package = MALLOC(6 + strlen(task));
strcpy(package, "task-"); strcat(package, task);
p = addpackage(pkgs, package, NULL, NULL, NULL, shortdesc, longdesc,
PRIORITY_UNKNOWN);
p->section = STRDUP(section);
@@ -461,8 +472,8 @@ void packages_readlist(struct tasks_t *tasks, struct packages_t *pkgs)
}

if (strncmp(name, "task-", 5) != 0) {
addpackage(pkgs, name, NULL, NULL, NULL, shortdesc,
NULL, priority);
addpackage(pkgs, name, NULL, NULL, NULL, shortdesc,
NULL, priority);
} else {
struct package_t *p;
struct task_t *t;


+ 21
- 15
debian/changelog View File

@@ -1,20 +1,26 @@
tasksel (1.3-1) unstable; urgency=low

* Added support for task description files.
* Read in /usr/share/tasksel/debian-tasks.desc as a task description
file.
* Added makedesc.pl, a program to generate a task description file from
a set of task descriptions.
* Got rid of all the name prettification code since it is no longer used
anyway.
* Killed filterdescription, the task packages in woody actually don't
have that problem anymore.
* Don't move cursor to the right after a task is selected.
* Removed unused tasksel.man from source package (keep pod).
* Fixed an obscure bug if a task package happened to be the last thing in
the available file.
* Enable debug mode by default, but turn it off when building from the
rules file.
* Joey Hess:
- Added support for task description files.
- Read in /usr/share/tasksel/debian-tasks.desc as a task description
file.
- Added makedesc.pl, a program to generate a task description file from
a set of task descriptions.
- Got rid of all the name prettification code since it is no longer used
anyway.
- Killed filterdescription, the task packages in woody actually don't
have that problem anymore.
- Don't move cursor to the right after a task is selected.
- Removed unused tasksel.man from source package (keep pod).
- Fixed an obscure bug if a task package happened to be the last thing in
the available file.
- Enable debug mode by default, but turn it off when building from the
rules file.

* Anthony Towns:
- Fix memory allocation bug when do a fake task- package
- Port most of the interesting tasks to the tasks file.
- Fix makedesc.pl to cope with +'s in a task name (c++-dev)

-- Joey Hess <joeyh@debian.org> Thu, 17 May 2001 14:47:06 -0400



+ 1
- 1
makedesc.pl View File

@@ -30,7 +30,7 @@ use File::Find;
find(\&processfile, $dir);

sub processfile {
return unless /^[-_.a-z0-9]+$/ and -f $_;
return unless /^[-+_.a-z0-9]+$/ and -f $_;
open (IN, $_) or die "$_: $!";
my %fields;
my $field="";


+ 25
- 0
tasks/basic-desktop View File

@@ -0,0 +1,25 @@
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.
.
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:
xfree86-common
xserver-common
xserver-xfree86
xlibs
xfonts-base
xfonts-100dpi
xfonts-75dpi
xfonts-scalable
xbase-clients
xutils

+ 20
- 0
tasks/c++-dev View File

@@ -0,0 +1,20 @@
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
C++ programming language, including:
o Tools common for C, C++ and Objective C development
o A C preprocessor
o A C++ compiler and the standard C++ library
o Documentation for the Standard Template Library
o Debugging tools
o Literate programming tools for C++
o An extensible C++ compiler
Packages:
task-devel-common
g++
cpp
manpages-dev
stl-manual
nowebm

+ 26
- 0
tasks/c-dev View File

@@ -0,0 +1,26 @@
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:
o Tools common for C, C++ and Objective C development
o A C preprocessor
o A C compiler
o Development files of the standard C library
o Debugging tools
o Literate programming tools for C
o C source analysis tools and tools to manipulate C source
Packages:
# task-devel-common
gcc
cpp
manpages-dev
autoproject
nowebm
c2man
cxref
cutils
tendra
cflow
liwc

+ 38
- 0
tasks/chinese-s View File

@@ -0,0 +1,38 @@
Task: chinese-s
Section: l10n
Description: Simplified Chinese environment
This 'task package' 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
doc-linux-zh-s
xfonts-arphic-gbsn00lp
xfonts-arphic-gkai00mp
xfonts-intl-chinese
rxvt-ml
chinput
xcin
zh-autoconvert
yiyantang
stardic
fortune-zh
xfonts-intl-chinese-big
cjk-latex
cce
yh
gs-cjk-resource,
cmap-adobe-gb1
pydict
chdrv
kon2
jfbterm
cxterm-gb
unifont
cedictgb


+ 37
- 0
tasks/chinese-t View File

@@ -0,0 +1,37 @@
Task: chinese-t
Section: l10n
Description: Traditional Chinese environment
This 'task package' 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 (>= 2.2.3-1)
debian-zh-faq-s
doc-linux-zh
xfonts-arphic-bsmi00lp
xfonts-arphic-bkai00mp
xfonts-intl-chinese
rxvt-ml
xcin
chinput
zh-autoconvert
yiyantang
pydict
stardic
fortune-zh
cjk-latex
chdrv
yh
ttfprint
bg5ps
gs-cjk-resource
cmap-adobe-cns1
xfonts-cmex-big5p
unifont
cxterm-big5
kon2
cedictb5

+ 16
- 0
tasks/database-server View File

@@ -0,0 +1,16 @@
Task: database-server
Section: server
Description: PostgreSQL database
This package installs 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
database access, through its facilities for transactions and fine-grained
locking.
Packages:
postgresql
postgresql-client
pgaccess
postgresql-doc
postgresql-contrib
libecpg3

+ 22
- 0
tasks/debian-dev View File

@@ -0,0 +1,22 @@
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

+ 53
- 0
tasks/desktop View File

@@ -0,0 +1,53 @@
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.
Packages:
# task-x-window-system-core
wmaker
gnome-session
gnome-panel
gnome-control-center
imlib-base
gnome-terminal
gnome-applets
gmc
esound
gnome-users-guide-en
gnome-help
gdm
gnome-utils
kdebase
konqueror
konsole
kdebase-doc
kdewallpapers
kuser
ksysv
kcron
kpackage
ksysctrl
secpolicy
ark
kcalc
kdf
kdepasswd
kedit
kfind
khexedit
kjots
knotes
kpm
ktimemon
pixie
kpaint
kiconedit
ksnapshot
kruler
enlightenment
fvwm
qvwm
mozilla

+ 12
- 0
tasks/dns-server View File

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


+ 17
- 0
tasks/fortran-dev View File

@@ -0,0 +1,17 @@
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.
Packages:
g77
ftnchek
fweb
slatec
asa

+ 17
- 0
tasks/games View File

@@ -0,0 +1,17 @@
Task: games
Section: user
Description: A selection of games
Selecting this package 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:
xtris
bsdgames
nethack
xgalaga
xscavenger
koules
gnome-gnomine
gnome-card-games
lincity-x
armagetron

+ 15
- 0
tasks/german View File

@@ -0,0 +1,15 @@
Task: german
Section: l10n
Description: German-speaking environment
This task package installs modifications and documentation in German
to help German speaking people using Debian.
Packages:
user-de
manpages-de
wngerman
wgerman
ingerman
igerman
doc-linux-de
trans-de-en
ding

+ 9
- 0
tasks/isdn View File

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

+ 36
- 0
tasks/japanese View File

@@ -0,0 +1,36 @@
Task: japanese
Section: l10n
Description: Japanese environment
This task package installs packages that makes it easier to use
Debian for Japanese-related operations.
Packages:
locales,
jfbterm
ja-trans
lv
nkf
doc-linux-ja
doc-debian-ja
manpages-ja
xmanpages-ja
kterm
kinput2-canna-wnn
skkinput
asiya24-vfont
watanabe-vfont
xfonts-base
xfonts-a12k12
xfonts-kappa20
xfonts-marumoji
xfonts-shinonome
xfonts-intl-japanese
xfonts-intl-japanese-big
ttf-xtt-wadalab-gothic
ttf-xtt-watanabe-mincho
canna
canna-utils
yc-el
freewnn-jserver
egg
skk
dbskkd-cdb

+ 15
- 0
tasks/junior View File

@@ -0,0 +1,15 @@
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.
Packages:
junior-toys
junior-math
junior-typing
junior-arcade
junior-writing
junior-sound
junior-doc

+ 16
- 0
tasks/korean View File

@@ -0,0 +1,16 @@
Task: korean
Section: l10n
Description: Korean-speaking environment
This task package installs programs, data files, fonts, and documentations
that make it easier to use Debian for Korean-related operations.
Packages:
locales
manpages-ko
doc-linux-ko
doc-debian-ko
hanterm
ami
xfonts-baekmuk
ami-gnome
hlatex
hlatex-fonts-base

+ 17
- 0
tasks/laptop View File

@@ -0,0 +1,17 @@
Task: laptop
Section: hware
Description: A selection of tools for laptop users
This is a collection of tools that laptop users will expect to find on a
system.
.
Power management
PCMCIA
cron control
Pacakges:
apmd
pcmcia-cs
anacron
netenv
irda-tools
irda-common
toshutils

+ 8
- 0
tasks/mail-server View File

@@ -0,0 +1,8 @@
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.
Packages:
uw-imapd
imap-server

+ 19
- 0
tasks/modem View File

@@ -0,0 +1,19 @@
Task: modem
Section: hware
Description: Dialup utilities
This package installs packages that address special needs of computers
using a parttime dialup connection.
Packages:
anacron
diald
dialdcost
fetchmail
junkbuster
lynx
ppp
pppconfig
wget
wvdial
wwwoffle
leafnode
lftp

+ 12
- 0
tasks/news-server View File

@@ -0,0 +1,12 @@
Task: news-server
Section: server
Description: USENET News Server
This package will 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
to operate a server.
Packages:
inn2

+ 20
- 0
tasks/objc-dev View File

@@ -0,0 +1,20 @@
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:
o Tools common for C, C++ and Objective C development
o A C preprocessor
o An Objective C compiler and library
o Debugging tools
o Literate programming tools for Objective C
Packages:
# task-debug
# task-devel-common
# task-c-dev
gobjc
cpp
manpages-dev
nowebm
objc-poc

+ 18
- 0
tasks/polish View File

@@ -0,0 +1,18 @@
Task: polish
Section: l10n
Description: Polish-speaking environment
This task package installs modifications and documentation in Polish
to help Polish speaking people using Debian.
Packages:
manpages-pl
fonty
konwert
ipolish
wpolish
doc-linux-pl
xfonts-biznet-iso-8859-2-base
xfonts-biznet-iso-8859-2-75dpi
manpages-pl-dev
wpolish
doc-linux-pl-html
xfonts-biznet-iso-8859-2-100dpi

+ 56
- 0
tasks/python-dev View File

@@ -0,0 +1,56 @@
Task: python-dev
Section: devel
Description: Full Python development environment
This package provides 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
ddd
dpkg-python
gadfly
gimp-python
htmlgen
idle
pydb
pyrite
python-bobo
python-bobopos
python-dev
python-examples
python-extclass
python-gdbm
python-gdk-imlib
python-gendoc
python-glade
python-gnome
python-gtk
python-history
python-imaging-sane
python-imaging-tk
python-kjbuckets
python-ldap
python-mpz
python-mxdatetime
python-mxstack
python-mxtexttools
python-mxtools
python-netcdf
python-newt
python-numeric
python-numeric-tutorial
python-pam
python-pdb
python-pmw
python-pygresql
python-rng
python-tk
python-wpy
python-xml
python-zlib
pythondoc
saml
sulfur
swig

+ 16
- 0
tasks/russian View File

@@ -0,0 +1,16 @@
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.
Packages:
console-cyrillic
manpages-ru
irussian
mueller7-dict
konwert
re
xfonts-bolkhov-koi8r
xfonts-cronyx-koi8r-100dpi

+ 14
- 0
tasks/samba-server View File

@@ -0,0 +1,14 @@
Task: samba-server
Section: server
Description: Samba SMB server
The samba server is a file and printer server for your Windows,
OS/2 or DOS clients. It can act as a primary domain server but
also like a workstaion.
.
The web based setup tool SWAT is included as well.
Packages:
samba
samba-doc
smbclient
swat
smbfs

+ 17
- 0
tasks/science View File

@@ -0,0 +1,17 @@
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.
Packages:
gnuplot
gperiodic
grace
pdl
octave2.0
plotutils
rasmol
r-base
yorick

+ 16
- 0
tasks/spanish View File

@@ -0,0 +1,16 @@
Task: spanish
Section: l10n
Description: Spanish environment
This 'task package' installs programs, data files, and
documentation that makes it easier to use Debian for
Spanish-related operations.
.
Este paquete tarea instala programas y documentación que hace
más fácil usar Debian para usuarios hispano-parlantes.
Packages:
locales
doc-linux-es
user-es
ispanish
wspanish
manpages-es

+ 17
- 0
tasks/tcltk-dev View File

@@ -0,0 +1,17 @@
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:
o Script-level manpages
o C-level manpages
o C headers and libraries
Packages:
tcl8.2-dev
tk8.2-dev
blt-dev
tktable-dev
itcl3.1-dev
itk3.1-dev
iwidgets3.1-dev

+ 21
- 0
tasks/tex View File

@@ -0,0 +1,21 @@
Task: tex
Section: misc
Description: TeX/LaTeX environment
metapackage for a complete TeX/LaTeX environment
Packages:
bibindex
bibtool
dvidvi
lacheck
mpage
pstoedit
psutils
tetex-base
tetex-bin
tetex-doc
tetex-extra
untex
xfig
latex2html
postscript-viewer
hyperlatex

Loading…
Cancel
Save