- Shortended the description of c-dev.

- Renamed Essential field to Key, to prevent confusion. - Implemented dropping of tasks that are missing key packages. - Enhanced listpackages.pl with support for listing key packages. - makedesc.pl too. - Key packages do not need to be listed under Packages too. - Updated tcl/tk to 8.4. - Removed localces from language tasks; language-env depends on it. - Changed around what is Key and what is not, more changes than I can record here. - Don't expand lsb package's deps, we want the whole thing or nothing. - Added makeoverride.pl, which will generate an override file from a directory of task files. - Remove user-de and user-es, language-env superscedes. - Back to just gimp for desktop task. - If a task is not in the task desc files, but is in the available file as a Task: line, do not display it.
19 years ago · dd7925cf26
37 changed files with 71 additions and 205 deletions
--- a/2
+++ b/2
@ -51,3 +51,5 @@ clean:
 	rm -f $(PROGRAM) $(TASKDESC) *.o *~
 	$(MAKE) -C po clean

+override:
+	@perl makeoverride.pl $(DESCDIR)
--- a/9
+++ b/9
@ -1,4 +1,11 @@
-$Id: TODO,v 1.10 2003/07/25 18:06:28 joeyh Exp $
+$Id: TODO,v 1.11 2003/07/25 23:56:36 joeyh Rel $
 - fix screen resize code (in dialogs, it doesn't work right)
 - figure out how to properly install the i18n stuff
 - show already installed tasks
+- language tasks like spanish that include stuff like mozilla-locale-es-es
+  and openoffice.org-l10n-es pull in all of mozilla and openoffice, which
+  is often not the desired effect. Fixes would include:
+    - make these packages only recommend the main packages
+    - put the language packages in the tasks that pull in OOo and mozilla
+      (but this is hard to maintain)
+    - stop this translation splitting nonsense
--- a/debian/changelog
+++ b/debian/changelog
@ -4,7 +4,6 @@ tasksel (1.26) unstable; urgency=low
    - Completed no.po.
  * Javier Fernández-Sanguino
    - Added missing useful packages to the spanish task
-    (including comments), maybe too much documentation (could be trimmed)?
  * Joey Hess
    - Updated copyright date range.
    - Make unselected buttons be the same color as the window itself.
@ -12,7 +11,7 @@ tasksel (1.26) unstable; urgency=low
    - Note in README that the way to get a task added is a bug report against
      this package. Closes: #144533
    - Removed broken python-bobo from python task. Closes: #180925
-    - The python task is retarget at providing a subset of the more useful
+    - The python task is retargeted at providing a subset of the more useful
      python tools, instead of everything. Semi-randomly removed some stuff.
      Someone who uses python might want to take over maintainership of this
      task.
@ -43,7 +42,7 @@ tasksel (1.26) unstable; urgency=low
    - Added kernel-compile task for custom kernel building. Closes: #184428
    - Blessed the idea of putting Maintainer fields in individual task files.
    - Removed nonexistant packages from tasks: netscape-zh-resource-477, 
-      dialdcost, hanterm
+      dialdcost, hanterm, tktabble-dev
    - Put cxterm-ks in korean task to replace hanterm. I hope that's right.
    - Rename mozilla-locale-es to mozilla-locale-es-es.
    - For chinese-t, use doc-linux-zh-text, which provides traditional
@ -53,8 +52,22 @@ tasksel (1.26) unstable; urgency=low
    - Shortended the description of c-dev.
    - Renamed Essential field to Key, to prevent confusion.
    - Implemented dropping of tasks that are missing key packages.
-
- -- Joey Hess <joeyh@debian.org>  Wed, 19 Mar 2003 23:12:33 +0100
+    - Enhanced listpackages.pl with support for listing key packages.
+    - makedesc.pl too.
+    - Key packages do not need to be listed under Packages too.
+    - Updated tcl/tk to 8.4.
+    - Removed localces from language tasks; language-env depends on it.
+    - Changed around what is Key and what is not, more changes than I can
+      record here.
+    - Don't expand lsb package's deps, we want the whole thing or nothing.
+    - Added makeoverride.pl, which will generate an override file from a
+      directory of task files.
+    - Remove user-de and user-es, language-env superscedes.
+    - Back to just gimp for desktop task.
+    - If a task is not in the task desc files, but is in the available file
+      as a Task: line, do not display it.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 25 Jul 2003 15:21:50 -0400

 tasksel (1.25) unstable; urgency=low

--- a/debian/control
+++ b/debian/control
@ -3,7 +3,7 @@ Section: base
 Priority: optional
 Maintainer: Randolph Chung <tausq@debian.org>
 Uploaders: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.5.8.0
+Standards-Version: 3.6.0
 Build-Depends: debhelper (>= 4), slang1-dev, gettext, dpkg-dev (>= 1.9.0)

 Package: tasksel
--- a/listpackages.pl
+++ b/listpackages.pl
@ -1,16 +1,22 @@
 #!/usr/bin/perl
 #
-# taskpackages directory
+# listpackages directory [field]
 #
 # This program spits out a list of all the packages listed in the tasks.
 #
 # If you go to auric, this command is then useful:
 #
-# for package in $(cat ~joeyh/tasklist); do
+# for package in $(listpackages); do
 #   madison -s testing -a "i386 all" $package >/dev/null || echo "No $package!"
 # done
+#
+# Or to see just key packages:
+#
+# listpackages tasks key

 my $dir=shift or die "no directory specified\n";
+my @toshow=qw{packages key};
+@toshow=@ARGV if @ARGV;

 use File::Find;
 find(\&processfile, $dir);
@ -37,5 +43,7 @@ sub processfile {
 	}
 	close IN;

-	print join("\n", split(' ', $fields{packages}))."\n";
+	my @list;
+	push @list, split(' ', $fields{$_}) foreach @toshow;
+	print join("\n", @list)."\n" if @list;
 }
--- a/makedesc.pl
+++ b/makedesc.pl
@ -74,12 +74,17 @@ sub processfile {
 	# 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";
-			}
-			if ($notmain{$_}) {
-				print STDERR "$file: $_ is in $notmain{$_}.\n";
+		foreach my $field (qw(key packages)) {
+			foreach (split ' ', $fields{$field}) {
+				if (! $package{$_}) {
+					print STDERR "$file: $_ is not a valid package.\n";
+					if ($field eq 'key') {
+						die "Above package is Key -- fatal error!\n";
+					}
+				}
+				if ($notmain{$_}) {
+					print STDERR "$file: $_ is in $notmain{$_}.\n";
+				}
 			}
 		}
 	}
--- a/tasks/README
+++ b/tasks/README
@ -18,7 +18,8 @@ When the task is selected, any of those packages that are available will be
 selected.

 The Key field is the same, but packages listed in it must be available or
-the task should not be displayed at all.
+the task should not be displayed at all. There's no need to list packages
+in the Packages field if they are listed as Key.

 Comments may appear in the file, by prefixing a line with a hash mark
 ('#').
--- a/tasks/basic-desktop
+++ b/tasks/basic-desktop
@ -7,4 +7,3 @@ Description: X window system
 Key:
 x-window-system
 Packages:
- x-window-system
--- a/tasks/c-dev
+++ b/tasks/c-dev
@ -9,14 +9,8 @@ Key:
 g++
 make
 binutils
- strace
- gdb
 Packages:
 # C compiling:
- gcc
- cpp
- make
- binutils
 flex
 bison
 gettext
@ -24,7 +18,6 @@ Packages:
 glibc-doc
 manpages-dev
 # for C++
- g++
 stl-manual
 # build systems
 autoconf
--- a/tasks/chinese-s
+++ b/tasks/chinese-s
@ -11,17 +11,14 @@ Key:
  xcin
  zhcon
  manpages-zh
+  language-env
 Packages:
-  locales
  debian-zh-faq-s
  doc-linux-zh-s
  x-ttcidfont-conf
  ttf-arphic-gbsn00lp
  ttf-arphic-gkai00mp
  xfonts-intl-chinese
-  rxvt-ml
-  chinput
-  xcin
  zh-autoconvert
  yiyantang
  stardic
@ -34,7 +31,6 @@ Packages:
  cce
  chdrv
  yh
-  zhcon
  kon2
  jfbterm
  cxterm-gb
@ -44,7 +40,4 @@ Packages:
  cmap-adobe-gb1
  unifont
  cedictgb
-  cpanel
-  language-env
  kde-i18n-zhcngb2312
-  manpages-zh
--- a/tasks/chinese-t
+++ b/tasks/chinese-t
@ -11,17 +11,14 @@ Key:
  xcin
  zhcon
  manpages-zh
+  language-env
 Packages:
-  locales
  debian-zh-faq-t
  doc-linux-zh-text
  x-ttcidfont-conf
  ttf-arphic-bsmi00lp
  ttf-arphic-bkai00mp
  xfonts-intl-chinese
-  rxvt-ml
-  xcin
-  chinput
  zh-autoconvert
  yiyantang
  pydict
@ -32,7 +29,6 @@ Packages:
  tfm-arphic-bkai00mp
  chdrv
  yh
-  zhcon
  cxterm-big5
  ttfprint
  bg5ps
@ -41,7 +37,4 @@ Packages:
  cmap-adobe-cns1
  unifont
  cedictb5
-  cpanel
-  language-env
  kde-i18n-zhtwbig5
-  manpages-zh
--- a/tasks/cyrillic
+++ b/tasks/cyrillic
@ -5,13 +5,11 @@ Description: Cyrillic environment
 order to use Cyrillic.  It supports Belarusian, Bulgarian,
 Macedonian, Russian, Serbian and Ukrainian.
 Key:
- language-env
- console-cyrillic
-Packages:
 # Easy configuration for some languages:
 language-env
 # Cyrillic on the console:
 console-cyrillic
+Packages:
 # Translates Cyrillic encodings.
 konwert
 # Keyboard state indicator and switcher for X:
--- a/tasks/danish
+++ b/tasks/danish
@ -4,11 +4,8 @@ Description: Danish environment
 This task installs packages and documentation in Danish
 to help Danish speaking people use Debian.
 Key:
- locales
 language-env
 Packages:
- locales
- language-env
 aspell-da
 idanish
 wdanish
@ -16,4 +13,3 @@ Packages:
 util-linux-locales
 openoffice.org-l10n-da
 mozilla-locale-da
- 
--- a/tasks/database-server
+++ b/tasks/database-server
@ -13,7 +13,6 @@ Description: SQL database
 Key:
 postgresql
 Packages: 
- postgresql
 postgresql-client
 pgaccess
 postgresql-doc
--- a/tasks/desktop
+++ b/tasks/desktop
@ -40,43 +40,10 @@ Key:
  gnome
 #endinclude
 Packages:
-  x-window-system-core
 # gdm allows picking between gnome and kde at login time
  gdm
  mozilla
  mozilla-psm
  menu
  abiword
-  gimp1.2
-#include gnome
-#Automatically added by doincludes.pl; do not edit.
-  gnome-core 
-  bug-buddy 
-  gconf-editor
-  evolution 
-  epiphany-browser 
-  gnumeric
-  abiword-gnome 
-  gnucash
-  xscreensaver-gnome
-  pan
-  gnome-gv
-  gnome
-#endinclude
-#include kde
-#Automatically added by doincludes.pl; do not edit.
-  fontconfig
-  kde-core
-  kde-amusements
-  kdeaddons
-  kdeadmin
-  kdeartwork
-  kdegraphics
-  kdemultimedia
-  kdenetwork
-  kdepim
-  kdeutils
-  koffice
-  quanta
-  kde
-#endinclude
+  gimp
--- a/tasks/dialup
+++ b/tasks/dialup
@ -10,14 +10,8 @@ Key:
 Packages:
 # Modem:
 diald
- ppp
 pppconfig
 wvdial
- # ISDN:
- isdnutils
- #sox # This is in task-dialup-isdn, but why? Ask maintainer.
- # DSL, cable:
- pppoe
 # Other handy stuff for dialup connections:
 anacron
 fetchmail
--- a/tasks/dns-server
+++ b/tasks/dns-server
@ -5,7 +5,6 @@ Description: DNS server
 Key:
 bind9
 Packages:
- bind9
 bind9-doc
 dnsutils
 lwresd
--- a/tasks/file-server
+++ b/tasks/file-server
@ -3,15 +3,13 @@ Section: server
 Description: File server
 This task sets up your system to be a file server.
 Key:
+ # Is this the best one? Will it work out of the box for new debian
+ # installs?
 nfs-kernel-server
 samba
 Packages:
 netatalk
- samba
 samba-doc
 smbclient
 swat
 smbfs
- # Is this the best one? Will it work out of the box for new debian
- # installs?
- nfs-kernel-server
--- a/tasks/french
+++ b/tasks/french
@ -9,12 +9,7 @@ Key:
 Packages:
 doc-linux-fr
 doc-debian-fr
-# echo-linux (is removed from debian)
-# ifrench --> conflicts with ifrench-gut
 ifrench-gut
- language-env
-# locales --> already required by language-env
- manpages-fr
 wfrench
 xfonts-intl-european
 xtel
--- a/tasks/german
+++ b/tasks/german
@ -4,14 +4,9 @@ Description: German environment
 This task installs packages and documentation in German
 to help German speaking people use Debian.
 Key:
- locales
 language-env
 manpages-de
 Packages:
- locales
- language-env
- user-de
- manpages-de
 wngerman
 wgerman
 ingerman
--- a/tasks/japanese
+++ b/tasks/japanese
@ -4,7 +4,6 @@ Description: Japanese environment
 This task installs packages that make it easier for Japanese speakers
 to use Debian.
 Key:
- locales
 language-env
 jfbterm
 kterm
@ -12,17 +11,12 @@ Key:
 manpages-ja
 canna
 Packages:
- locales
- language-env
- jfbterm 
 ja-trans
 lv
 nkf
 doc-linux-ja-text
 doc-debian-ja
- manpages-ja
 xmanpages-ja
- kterm
 kinput2-canna-wnn
 skkinput
 asiya24-vfont
@ -32,11 +26,9 @@ Packages:
 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
--- a/tasks/java-dev
+++ b/tasks/java-dev
@ -6,8 +6,6 @@ Key:
 gcj
 java-common
 Packages:
- gcj
- java-common
 java2html
 libservlet2.2-java
 kaffe
--- a/tasks/kernel-compile
+++ b/tasks/kernel-compile
@ -10,8 +10,6 @@ Key:
 # How this works for other architectures, I really cannot say.
 kernel-source-2.4.21
 Packages:
- kernel-package
- kernel-source-2.4.21
 libc6-dev
 debianutils
 # Only on intel, but it will be ignored elsewhere.
--- a/tasks/korean
+++ b/tasks/korean
@ -4,17 +4,13 @@ Description: Korean environment
 This task installs programs, data files, fonts, and documentation
 to make it easier for Korean speakers to use Debian.
 Key:
- locales
+ language-env
 manpages-ko
 cxterm-ks
 ami
 Packages:
- locales
- manpages-ko
 doc-linux-text-ko
 doc-debian-ko
- cxterm-ks
- ami
 xfonts-baekmuk
 ami-gnome
 hlatex
--- a/tasks/laptop
+++ b/tasks/laptop
@ -7,8 +7,6 @@ Key:
 apmd
 pcmcia-cs
 Packages:
- apmd
- pcmcia-cs
 anacron
 guessnet
 irda-tools
--- a/tasks/lsb
+++ b/tasks/lsb
@ -3,37 +3,8 @@ Section: user
 Description: Linux Standard Base
 This task makes the system compliant with the Linux Standard Base,
 allowing you to install and use LSB packages.
-Packages:
-#include lsb
-#Automatically added by doincludes.pl; do not edit.
-  lsb-release
-  libgl1
-  xlibs
-  libz1
-  exim 
-  at
-  bc
-  binutils
-  bsdmainutils
-  cpio
-  cron
-  file
-  libc6-dev 
-  locales
-  lpr
-  m4
-  make
-  man-db
-  mawk 
-  ncurses-term
-  passwd
-  patch
-  procps
-  psmisc
-  rsync
-  alien 
-  python 
-  debconf 
+Key:
+  # Not #included because it expandes to list virtual packages, which would
+  # make it not show on the list. Anyway, we want the whole thing, or
+  # nothing.
  lsb
-#endinclude
-
--- a/tasks/office
+++ b/tasks/office
@ -1,4 +1,4 @@
-Task: produc
+Task: office
 Section: user
 Description: Office environment
 This task provides a suite of office productivity software, including a
@ -23,21 +23,5 @@ Key:
  gnome
 #endinclude
 Packages:
-  x-window-system-core
  menu
  openoffice.org
-#include gnome-office
-#Automatically added by doincludes.pl; do not edit.
-  gnome-core 
-  bug-buddy 
-  gconf-editor
-  evolution 
-  epiphany-browser 
-  gnumeric
-  abiword-gnome 
-  gnucash
-  xscreensaver-gnome
-  pan
-  gnome-gv
-  gnome
-#endinclude
--- a/tasks/polish
+++ b/tasks/polish
@ -4,12 +4,9 @@ Description: Polish environment
 This task installs packages and documentation in Polish
 to help Polish speaking people use Debian.
 Key:
- locales
 manpages-pl
 language-env
 Packages:
- locales
- manpages-pl
 fonty
 konwert
 ipolish
@ -20,4 +17,3 @@ Packages:
 manpages-pl-dev
 doc-linux-pl-html
 xfonts-biznet-iso-8859-2-100dpi
- language-env
--- a/tasks/print-server
+++ b/tasks/print-server
@ -10,6 +10,5 @@ Packages:
 smbclient
 swat
 smbfs
- lpr
 magicfilter
 gs
--- a/tasks/python-dev
+++ b/tasks/python-dev
@ -6,7 +6,6 @@ Description: Python
 Key:
 python
 Packages:
- python
 python-doc
 ddd
 python-htmlgen
--- a/tasks/russian
+++ b/tasks/russian
@ -5,14 +5,10 @@ Description: Russian environment
 to help Russian speaking people use Debian.
 Maintainer: Peter Novodvorsky <nidd@debian.org>
 Key:
- locales
 language-env
 manpages-ru
 Packages:
- locales
- language-env
 console-cyrillic
- manpages-ru
 irussian
 mueller7-dict
 konwert
--- a/tasks/science
+++ b/tasks/science
@ -1,6 +1,6 @@
 Task: science
 Section: user
-Description: scientific applications
+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.
--- a/tasks/spanish
+++ b/tasks/spanish
@ -4,15 +4,9 @@ Description: Spanish environment
 This task installs programs, data files,  and
 documentation that makes it easier for Spanish speakers to use Debian.
 Key:
- locales
 language-env
 manpages-es
- user-es
 Packages: 
-# System-wide configuration
- locales
- language-env
- user-es
 # Dictionaries
 ispanish
 wspanish
@ -25,7 +19,6 @@ Packages:
 doc-linux-es
 doc-es-misc
 linux-tutorial-es
- manpages-es
 # Other packages to i18n common software
 util-linux-locales
 mozilla-locale-es-es
--- a/tasks/tcltk-dev
+++ b/tasks/tcltk-dev
@ -2,17 +2,11 @@ Task: tcltk-dev
 Section: devel
 Description: Tcl/Tk
 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
+ and Tk Toolkit.
 Key:
- tcl8.3-dev
- tk8.3-dev
+ tcl8.4-dev
+ tk8.4-dev
 Packages:
- tcl8.3-dev
- tk8.3-dev
 blt-dev
- tktable-dev
 itcl3.1-dev
 itk3.1-dev
--- a/tasks/tex
+++ b/tasks/tex
@ -14,10 +14,7 @@ Packages:
 mpage
 pstoedit
 psutils
- tetex-base
- tetex-bin
 tetex-doc
- tetex-extra
 untex
 xfig
 latex2html
--- a/tasks/unix-server
+++ b/tasks/unix-server
@ -1,6 +1,6 @@
 Task: unix-server
 Section: server
-Description: Conventional unix server
+Description: Conventional Unix server
 This task selects packages that would typically be found on a conventional
 multi-user unix system with remote users. Do be warned that this includes
 a number of daemons.
--- a/tasks/web-server
+++ b/tasks/web-server
@ -4,8 +4,8 @@ Description: Web server
 This task selects a packages useful for a general purpose web server
 system.
 Key:
+ # apache2 yet?
 apache
 Packages:
- apache
 analog
 # TODO: what else? dwww? cgi and/or dynamic web site stuff?