Browse Source

* Rename the "Depends" field to "Enhances" which is much closer to what it's

actually used for. A task such as french-desktop enchances systems with
  the desktop and french tasks installed on it.
keep-around/43e990ab3f4cc50982f8dbc32e3465ca7c827876
Joey Hess 16 years ago
parent
commit
00ce6caa9d
  1. 11
      README
  2. 5
      debian/changelog
  3. 2
      makedesc.pl
  4. 2
      tasks.disabled/kde-desktop
  5. 2
      tasks/arabic-desktop
  6. 2
      tasks/bengali-desktop
  7. 2
      tasks/brazilian-portuguese-desktop
  8. 2
      tasks/bulgarian
  9. 2
      tasks/bulgarian-desktop
  10. 2
      tasks/catalan-desktop
  11. 2
      tasks/chinese-s-desktop
  12. 2
      tasks/chinese-t-desktop
  13. 2
      tasks/cyrillic-desktop
  14. 2
      tasks/czech-desktop
  15. 2
      tasks/danish-desktop
  16. 2
      tasks/dutch-desktop
  17. 2
      tasks/french-desktop
  18. 2
      tasks/german-desktop
  19. 2
      tasks/gnome-desktop
  20. 2
      tasks/greek-desktop
  21. 2
      tasks/hebrew-desktop
  22. 2
      tasks/hindi-desktop
  23. 2
      tasks/hungarian-desktop
  24. 2
      tasks/italian-desktop
  25. 2
      tasks/japanese-desktop
  26. 2
      tasks/korean-desktop
  27. 2
      tasks/lithuanian-desktop
  28. 2
      tasks/norwegian-desktop
  29. 2
      tasks/persian-desktop
  30. 2
      tasks/polish-desktop
  31. 2
      tasks/punjabi-desktop
  32. 2
      tasks/romanian-desktop
  33. 2
      tasks/russian-desktop
  34. 2
      tasks/slovak-desktop
  35. 2
      tasks/spanish-desktop
  36. 2
      tasks/swedish-desktop
  37. 2
      tasks/thai-desktop
  38. 2
      tasks/turkish-desktop
  39. 2
      tasks/ukrainian-desktop
  40. 14
      tasksel.pl

11
README

@ -18,7 +18,7 @@ debian-tasks.desc to remove tasks.
The file format is a rfc-822 style stanza, with fields named Task, Section,
Description (which should include an extended description), Key, Packages,
Depends, Test- and Relevance fields. Here is an example:
Enhances, Test- and Relevance fields. Here is an example:
Task: graphical-games
Section: user
@ -76,9 +76,12 @@ handles this by comparing the value of the Test-lang field of a task with
the locale setting. Tests could also be used for things like automatically
installing hardware support tasks on systems with the right hardware.
There is rudimentary support for tasks that depend on other tasks. If a
task has a Depends field, then it should only be installed if all the tasks
listed as dependencies are installed.
There is support for tasks that enhance other tasks. If a task has a
Enhances field, then it should only be installed if all the tasks
listed as in that field are installed. For example, a french-desktop task
enchances a system that has both the french and desktop tasks, and will be
automatically installed on such a system but not others. Such tasks are
hidden from the menu.
If a task is important enough that it should go near the top of its
section, give it a relevance of 9 or 10. If a task is not likely to be

5
debian/changelog

@ -23,8 +23,11 @@ tasksel (2.43) UNRELEASED; urgency=low
[ Joey Hess ]
* Switch back to x-window-system-core until xorg reaches testing.
* Rename the "Depends" field to "Enhances" which is much closer to what it's
actually used for. A task such as french-desktop enchances systems with
the desktop and french tasks installed on it.
-- Joey Hess <joeyh@debian.org> Sun, 23 Apr 2006 14:47:42 -0400
-- Joey Hess <joeyh@debian.org> Sun, 23 Apr 2006 15:58:13 -0400
tasksel (2.42) unstable; urgency=low

2
makedesc.pl

@ -94,7 +94,7 @@ sub processfile {
}
}
foreach (qw{task section relevance description key depends packages},
foreach (qw{task section relevance description key enhances depends packages},
grep(/^test-(.*)/, keys %fields)) {
print OUT ucfirst($_).": ".$fields{$_}."\n" if length $fields{$_};
}

2
tasks.disabled/kde-desktop

@ -1,7 +1,7 @@
Task: kde-desktop
Relevance: 8
Section: user
Depends: desktop
Enhances: desktop
Test-new-install: skip skip
Description: KDE desktop environment
This task provides basic "desktop" software using the K Desktop

2
tasks/arabic-desktop

@ -1,5 +1,5 @@
Task: arabic-desktop
Depends: desktop, arabic
Enhances: desktop, arabic
Section: l10n
Description: Arabic environment
This task localises the desktop in Arabic.

2
tasks/bengali-desktop

@ -1,5 +1,5 @@
Task: bengali-desktop
Depends: desktop, bengali
Enhances: desktop, bengali
Section: l10n
Description: Bengali environment
This task localises the desktop in Bengali.

2
tasks/brazilian-portuguese-desktop

@ -1,5 +1,5 @@
Task: brazilian-portuguese-desktop
Depends: desktop, brazilian-portuguese
Enhances: desktop, brazilian-portuguese
Section: l10n
Maintainer: Otavio Salvador <otavio@debian.org>
Description: Brazilian Portuguese desktop

2
tasks/bulgarian

@ -1,6 +1,6 @@
Task: bulgarian
Test-lang: bg
Depends: cyrillic
Enhances: cyrillic
Section: l10n
Description: Bulgarian environment
This task installs programs and data files that make it easier for

2
tasks/bulgarian-desktop

@ -1,5 +1,5 @@
Task: bulgarian-desktop
Depends: desktop, bulgarian
Enhances: desktop, bulgarian
Section: l10n
Description: Bulgarian desktop
This task localises the desktop in Bulgarian.

2
tasks/catalan-desktop

@ -1,5 +1,5 @@
Task: catalan-desktop
Depends: desktop, catalan
Enhances: desktop, catalan
Section: l10n
Maintainer: Jordi Mallach <jordi@debian.org>
Description: Catalan desktop

2
tasks/chinese-s-desktop

@ -1,5 +1,5 @@
Task: chinese-s-desktop
Depends: desktop, chinese-s
Enhances: desktop, chinese-s
Section: l10n
Description: Simplified Chinese desktop
This task localises the desktop in Simplified Chinese.

2
tasks/chinese-t-desktop

@ -1,5 +1,5 @@
Task: chinese-t-desktop
Depends: desktop, chinese-t
Enhances: desktop, chinese-t
Section: l10n
Description: Traditional Chinese environment
This task localises the desktop in Traditional Chinese.

2
tasks/cyrillic-desktop

@ -1,5 +1,5 @@
Task: cyrillic-desktop
Depends: desktop, cyrillic
Enhances: desktop, cyrillic
Section: l10n
Description: Cyrillic desktop
This task localises the desktop in Cyrillic.

2
tasks/czech-desktop

@ -1,5 +1,5 @@
Task: czech-desktop
Depends: czech, desktop
Enhances: czech, desktop
Section: l10n
Description: Czech desktop
This task localises the desktop in Czech.

2
tasks/danish-desktop

@ -1,5 +1,5 @@
Task: danish-desktop
Depends: desktop, danish
Enhances: desktop, danish
Section: l10n
Description: Danish desktop
This task localises the desktop in Danish.

2
tasks/dutch-desktop

@ -1,5 +1,5 @@
Task: dutch-desktop
Depends: desktop, dutch
Enhances: desktop, dutch
Section: l10n
Description: Dutch environment
This task localises the desktop in Dutch.

2
tasks/french-desktop

@ -1,5 +1,5 @@
Task: french-desktop
Depends: french, desktop
Enhances: french, desktop
Section: l10n
Description: French desktop
This task localises the desktop in French.

2
tasks/german-desktop

@ -1,5 +1,5 @@
Task: german-desktop
Depends: desktop, german
Enhances: desktop, german
Section: l10n
Description: German desktop
This task localises the desktop in German.

2
tasks/gnome-desktop

@ -1,7 +1,7 @@
Task: gnome-desktop
Relevance: 8
Section: user
Depends: desktop
Enhances: desktop
Test-new-install: skip skip
Description: Gnome desktop environment
This task provides basic "desktop" software using the Gnome desktop

2
tasks/greek-desktop

@ -1,5 +1,5 @@
Task: greek-desktop
Depends: desktop, greek
Enhances: desktop, greek
Section: l10n
Maintainer: Konstantinos Margaritis <markos@debian.org>
Description: Greek desktop

2
tasks/hebrew-desktop

@ -1,5 +1,5 @@
Task: hebrew-desktop
Depends: desktop, hebrew
Enhances: desktop, hebrew
Section: l10n
Description: Hebrew desktop
This task localises the desktop in Hebrew.

2
tasks/hindi-desktop

@ -1,5 +1,5 @@
Task: hindi-desktop
Depends: desktop, hindi
Enhances: desktop, hindi
Section: l10n
Description: Hindi environment
This task localises the desktop in Hindi.

2
tasks/hungarian-desktop

@ -1,5 +1,5 @@
Task: hungarian-desktop
Depends: hungarian, desktop
Enhances: hungarian, desktop
Section: l10n
Description: Hungarian desktop
This task localises the desktop in Hungarian.

2
tasks/italian-desktop

@ -1,5 +1,5 @@
Task: italian-desktop
Depends: desktop, italian
Enhances: desktop, italian
Section: l10n
Description: Italian desktop
This task localises the desktop in Italian.

2
tasks/japanese-desktop

@ -1,5 +1,5 @@
Task: japanese-desktop
Depends: desktop, japanese
Enhances: desktop, japanese
Section: l10n
Description: Japanese desktop environment
This task localises the desktop in Japanese.

2
tasks/korean-desktop

@ -1,5 +1,5 @@
Task: korean-desktop
Depends: desktop, korean
Enhances: desktop, korean
Section: l10n
Description: Korean desktop
This task localises the desktop in Korean.

2
tasks/lithuanian-desktop

@ -1,5 +1,5 @@
Task: lithuanian-desktop
Depends: desktop, lithuanian
Enhances: desktop, lithuanian
Section: l10n
Maintainer: Kęstutis Biliūnas <kebil@kaunas.init.lt>
Description: Lithuanian desktop

2
tasks/norwegian-desktop

@ -1,5 +1,5 @@
Task: norwegian-desktop
Depends: desktop, norwegian
Enhances: desktop, norwegian
Section: l10n
Description: Norwegian (Bokmaal and Nynorsk) desktop
This task localises the desktop in Norwegian.

2
tasks/persian-desktop

@ -1,5 +1,5 @@
Task: persian-desktop
Depends: desktop, persian
Enhances: desktop, persian
Section: l10n
Description: Persian environment
This task localises the desktop in Persian.

2
tasks/polish-desktop

@ -1,5 +1,5 @@
Task: polish-desktop
Depends: desktop, polish
Enhances: desktop, polish
Section: l10n
Description: Polish desktop
This task localises the desktop in Polish.

2
tasks/punjabi-desktop

@ -1,5 +1,5 @@
Task: punjabi-desktop
Depends: desktop, punjabi
Enhances: desktop, punjabi
Section: l10n
Description: Punjabi environment
This task localises the desktop in Punjabi.

2
tasks/romanian-desktop

@ -1,5 +1,5 @@
Task: romanian-desktop
Depends: desktop, romanian
Enhances: desktop, romanian
Section: l10n
Description: Romanian desktop
This task localises the desktop in Romanian.

2
tasks/russian-desktop

@ -1,5 +1,5 @@
Task: russian-desktop
Depends: desktop, russian
Enhances: desktop, russian
Section: l10n
Description: Russian desktop
This task localises the desktop in Russian.

2
tasks/slovak-desktop

@ -1,5 +1,5 @@
Task: slovak-desktop
Depends: slovak, desktop
Enhances: slovak, desktop
Section: l10n
Description: Slovak desktop
This task localises the desktop in Slovak.

2
tasks/spanish-desktop

@ -1,5 +1,5 @@
Task: spanish-desktop
Depends: desktop, spanish
Enhances: desktop, spanish
Section: l10n
Description: Spanish desktop
This task localises the desktop in Spanish.

2
tasks/swedish-desktop

@ -1,5 +1,5 @@
Task: swedish-desktop
Depends: desktop, swedish
Enhances: desktop, swedish
Section: l10n
Description: Swedish desktop
This task localises the desktop in Swedish.

2
tasks/thai-desktop

@ -1,5 +1,5 @@
Task: thai-desktop
Depends: desktop, thai
Enhances: desktop, thai
Section: l10n
Description: Thai desktop
This task localises the desktop in Thai.

2
tasks/turkish-desktop

@ -1,5 +1,5 @@
Task: turkish-desktop
Depends: desktop, turkish
Enhances: desktop, turkish
Section: l10n
Description: Turkish desktop
This task localises the desktop in Turkish.

2
tasks/ukrainian-desktop

@ -1,5 +1,5 @@
Task: ukrainian-desktop
Depends: desktop, ukrainian
Enhances: desktop, ukrainian
Section: l10n
Description: Ukrainian desktop
This task localises the desktop in Ukrainian.

14
tasksel.pl

@ -290,11 +290,11 @@ sub task_test {
return $task;
}
# Hides a task and marks it not to be installed if it depends on other
# Hides a task and marks it not to be installed if it enhances other
# tasks.
sub hide_dependent_tasks {
sub hide_enhancing_tasks {
my $task=shift;
if (exists $task->{depends} && length $task->{depends}) {
if (exists $task->{enhances} && length $task->{enhances}) {
$task->{_display} = 0;
$task->{_install} = 0;
}
@ -425,7 +425,7 @@ sub main {
# This is relatively expensive, get the full list of available tasks and
# mark them.
my @tasks=map { hide_dependent_tasks($_) } map { task_test($_, $options{"new-install"}) }
my @tasks=map { hide_enhancing_tasks($_) } map { task_test($_, $options{"new-install"}) }
grep { task_avail($_) } all_tasks();
if ($options{"list-tasks"}) {
@ -507,11 +507,11 @@ sub main {
}
}
# Mark dependenent tasks for install if their dependencies are met.
# Mark enhancing tasks for install if their dependencies are met.
foreach my $task (@tasks) {
if (! $task->{_install} && exists $task->{depends} && length $task->{depends} ) {
if (! $task->{_install} && exists $task->{enhances} && length $task->{enhances} ) {
$task->{_install} = 1;
foreach my $dep (split(', ', $task->{depends})) {
foreach my $dep (split(', ', $task->{enhances})) {
if (! grep { $_->{task} eq $dep && $_->{_install} } @tasks) {
$task->{_install} = 0;
}

Loading…
Cancel
Save