Commit 2e7def81 authored by Joey Hess's avatar Joey Hess

* Joey Hess

     - Add support for inter-task dependencies.
     - Add a bunch of lang-desktop tasks, will be auto-installed if the desktop
       task and given language are installed. Closes: #202907, #257863
     - Add a Swedish task by Per Olofsson. Closes: #251536
   * Translations
     - André Luís Lopes
       - Updated Brazilian Portuguese translation.
parent 60506fb4
- 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
......@@ -94,7 +94,7 @@ sub processfile {
}
}
foreach (qw{task section relevance description key},
foreach (qw{task section relevance description key depends},
grep(/^test-(.*)/, keys %fields)) {
print OUT ucfirst($_).": ".$fields{$_}."\n" if length $fields{$_};
}
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-07-08 19:35-0400\n"
"POT-Creation-Date: 2004-07-14 15:31-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../tasksel.pl:188
#: ../tasksel.pl:199
msgid ""
"Usage:\n"
"tasksel install <task>\n"
......@@ -28,10 +28,6 @@ msgid ""
"\t-n -- don't show UI; use with -r or -i usually\n"
msgstr ""
#: ../tasksel.pl:249
msgid "ignoring other selected packages in favour of manual package selection"
msgstr ""
#: ../tasksel.pl:253 ../tasksel.pl:265
#: ../tasksel.pl:265 ../tasksel.pl:291
msgid "aptitude failed"
msgstr ""
......@@ -53,6 +53,10 @@ 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.
Packages listed for different tasks (and within a single task)
should not conflict, or the results will be rather arbitrary.
......
......@@ -15,7 +15,4 @@ Packages:
aspell-pt-br
# Other packages to i18n common software
util-linux-locales
mozilla-locale-ptbr
kde-i18n-ptbr
openoffice.org-l10n-pt-br
myspell-pt-br
Task: brazilian-portuguese-desktop
Depends: desktop, brazilian-portuguese
Section: l10n
Maintainer: Otavio Salvador <otavio@debian.org>
Description: Brazilian Portuguese desktop
This task makes the desktop be localised in Brasilian Portuguese.
Key:
Packages:
mozilla-locale-ptbr
kde-i18n-ptbr
openoffice.org-l10n-pt-br
......@@ -11,9 +11,5 @@ Packages:
aspell-ca
icatalan
wcatalan
kde-i18n-ca
myspell-ca
util-linux-locales
openoffice.org-l10n-ca
koffice-i18n-ca
mozilla-locale-ca
Task: catalan-desktop
Depends: desktop, catalan
Section: l10n
Maintainer: Jordi Mallach <jordi@debian.org>
Description: Catalan desktop
This task makes the desktop be localised in Catalan.
Key:
Packages:
kde-i18n-ca
koffice-i18n-ca
mozilla-locale-ca
openoffice.org-l10n-ca
......@@ -7,6 +7,7 @@ Description: Simplified Chinese environment
to use Debian, using the simplified Chinese encoding.
Key:
cpanel
# Is X really key for chinese?
rxvt-ml
chinput
xcin
......@@ -26,7 +27,6 @@ Packages:
pydict
fortune-zh
xfonts-intl-chinese-big
cjk-latex
tfm-arphic-gbsn00lp
tfm-arphic-gkai00mp
cce
......@@ -39,6 +39,3 @@ Packages:
gs-cjk-resource
cmap-adobe-gb1
unifont
openoffice.org-l10n-zh-cn
openoffice.org-help-zh-cn
kde-i18n-zhcn
Task: chinese-s-desktop
Depends: desktop, chinese-s
Section: l10n
Description: Simplified Chinese desktop
This task makes the desktop be localised in Simplified Chinese
Key:
Packages:
openoffice.org-l10n-zh-cn
openoffice.org-help-zh-cn
kde-i18n-zhcn
......@@ -7,6 +7,7 @@ Description: Traditional Chinese environment
to use Debian, using the traditional Chinese encoding.
Key:
cpanel
# Is X really key for chinese?
rxvt-ml
chinput
xcin
......@@ -24,7 +25,6 @@ Packages:
pydict
stardic
fortune-zh
cjk-latex
tfm-arphic-bsmi00lp
tfm-arphic-bkai00mp
chdrv
......@@ -36,6 +36,3 @@ Packages:
cmap-adobe-cns1
unifont
cedictb5
openoffice.org-l10n-zh-tw
openoffice.org-help-zh-tw
kde-i18n-zhtw
Task: chinese-t-desktop
Depends: desktop, chinese-t
Section: l10n
Description: Traditional Chinese environment
This task makes the desktop be localised in Traditional Chinese.
Key:
Packages:
openoffice.org-l10n-zh-tw
openoffice.org-help-zh-tw
kde-i18n-zhtw
......@@ -13,29 +13,3 @@ Key:
Packages:
# Translates Cyrillic encodings.
konwert
# Keyboard state indicator and switcher for X:
xxkb
# The main stuff: fonts for X.
# For CP1251 (Belarusian and Bulgarian):
xfonts-bolkhov-cp1251-misc
xfonts-bolkhov-cp1251-75dpi
xfonts-cronyx-cp1251-100dpi
# For ISO 8859-5 (Macedonian and Serbian):
xfonts-cronyx-isocyr-misc
xfonts-cronyx-isocyr-75dpi
xfonts-cronyx-isocyr-100dpi
# For KOI8-R (Russian):
xfonts-bolkhov-koi8r-misc
xfonts-bolkhov-koi8r-75dpi
xfonts-cronyx-koi8r-100dpi
# For KOI8-U (Ukrainian):
xfonts-bolkhov-koi8u-misc
xfonts-bolkhov-koi8u-75dpi
xfonts-cronyx-koi8u-100dpi
# For Unicode:
# Should we include these?
#xfonts-bolkhov-misc
#xfonts-bolkhov-75dpi
#xfonts-cronyx-100dpi
# This package is obsoleted, but the tradition requires it:
xfonts-cyrillic
Task: cyrillic-desktop
Depends: desktop, cyrillic
Section: l10n
Description: Cyrillic desktop
This task makes the desktop be localised in Cyrillic
It supports Belarusian, Bulgarian, Macedonian, Russian, Serbian and Ukrainian.
Key:
Packages:
# Keyboard state indicator and switcher for X:
xxkb
# The main stuff: fonts for X.
# For CP1251 (Belarusian and Bulgarian):
xfonts-bolkhov-cp1251-misc
xfonts-bolkhov-cp1251-75dpi
xfonts-cronyx-cp1251-100dpi
# For ISO 8859-5 (Macedonian and Serbian):
xfonts-cronyx-isocyr-misc
xfonts-cronyx-isocyr-75dpi
xfonts-cronyx-isocyr-100dpi
# For KOI8-R (Russian):
xfonts-bolkhov-koi8r-misc
xfonts-bolkhov-koi8r-75dpi
xfonts-cronyx-koi8r-100dpi
# For KOI8-U (Ukrainian):
xfonts-bolkhov-koi8u-misc
xfonts-bolkhov-koi8u-75dpi
xfonts-cronyx-koi8u-100dpi
# For Unicode:
# Should we include these?
#xfonts-bolkhov-misc
#xfonts-bolkhov-75dpi
#xfonts-cronyx-100dpi
# This package is obsoleted, but the tradition requires it:
xfonts-cyrillic
......@@ -10,9 +10,4 @@ Packages:
aspell-da
idanish
wdanish
kde-i18n-da
util-linux-locales
openoffice.org-l10n-da
koffice-i18n-da
mozilla-locale-da
Task: danish-desktop
Depends: desktop, danish
Section: l10n
Description: Danish desktop
This task makes the desktop be localised in Danish
Packages:
kde-i18n-da
openoffice.org-l10n-da
koffice-i18n-da
mozilla-locale-da
......@@ -21,7 +21,7 @@ Packages:
xprt-xprintorg
menu
gimp
# a screen saver does silly wthings without this
# a screen saver does silly things without this
fortune-mod
# openoffice is the best word processor / office suite at the moment
openoffice.org
......@@ -29,4 +29,3 @@ Packages:
openoffice.org-help-en
myspell-en-us
myspell-en-gb
xprt-xprintorg
......@@ -12,9 +12,4 @@ Packages:
doc-debian-fr
ifrench-gut
wfrench
xfonts-intl-european
xtel
openoffice.org-l10n-fr
kde-i18n-fr
openoffice.org-help-fr
myspell-fr-gut
Task: french-desktop
Depends: french, desktop
Section: l10n
Description: French desktop
This task makes the desktop be localised in French
Key:
Packages:
openoffice.org-l10n-fr
openoffice.org-help-fr
xfonts-intl-european
kde-i18n-fr
......@@ -14,10 +14,6 @@ Packages:
doc-linux-de
trans-de-en
ding
openoffice.org-l10n-de
kde-i18n-de
myspell-de-de
myspell-de-at
myspell-de-ch
openoffice.org-help-de
mozilla-locale-de-at
Task: german-desktop
Depends: desktop, german
Section: l10n
Description: German desktop
This task makes the desktop be localised in German
Key:
Packages:
kde-i18n-de
openoffice.org-help-de
openoffice.org-l10n-de
mozilla-locale-de-at
......@@ -9,13 +9,4 @@ Key:
language-env
# fonty
Packages:
kde-i18n-el
koffice-i18n-el
mozilla-locale-el
openoffice.org-l10n-el
openoffice.org-help-el
ttf-freefont
ttf-thryomanes
xfonts-intl-european
#xfonts-efont-unicode
#xfonts-efont-unicode-ib
# none
Task: greek-desktop
Depends: desktop, greek
Section: l10n
Maintainer: Konstantinos Margaritis <markos@debian.org>
Description: Greek desktop
This task makes the desktop be localised in Greek
Key:
Packages:
xfonts-intl-european
#xfonts-efont-unicode
#xfonts-efont-unicode-ib
kde-i18n-el
koffice-i18n-el
mozilla-locale-el
openoffice.org-l10n-el
openoffice.org-help-el
ttf-freefont
ttf-thryomanes
......@@ -10,7 +10,3 @@ Packages:
bidiv
culmus
hspell
kde-i18n-he
koffice-i18n-he
ivritex
hspell-gui
Task: hebrew-desktop
Depends: desktop, hebrew
Section: l10n
Description: Hebrew desktop
This task makes the desktop be localised in Hebrew
Maintainer: Shlomi Loubaton <loubaton.shlomi@012.net.il>
Key:
Packages:
hspell-gui
kde-i18n-he
koffice-i18n-he
......@@ -15,14 +15,7 @@ Packages:
doc-linux-it-text
fortunes-it
iitalian
kde-18n-it
koffice-i18n-it
maint-guide-it
manpages-it
mozilla-locale-it
myspell-it
openoffice.org-help-it
openoffice.org-hyphenation-it
openoffice.org-l10n-it
witalian
xfonts-intl-european
Task: italian-desktop
Depends: desktop, italian
Section: l10n
Description: Italian desktop
This task makes the desktop be localised in Italian
Key:
Packages:
xfonts-intl-european
openoffice.org-help-it
openoffice.org-hyphenation-it
openoffice.org-l10n-it
mozilla-locale-it
kde-i18n-it
koffice-i18n-it
......@@ -39,7 +39,3 @@ Packages:
egg
skk
dbskkd-cdb
openoffice.org-l10n-ja
kde-i18n-ja
openoffice.org-help-ja
mozilla-locale-ja
Task: japanese-desktop
Depends: desktop, japanese
Section: l10n
Description: Japanese environment
This task makes the desktop be localised in Japanese
Key:
Packages:
openoffice.org-l10n-ja
kde-i18n-ja
openoffice.org-help-ja
mozilla-locale-ja
......@@ -10,14 +10,8 @@ Key:
nabi
ttf-unfonts
Packages:
imhangul
doc-debian-ko
doc-linux-text-ko
hlatex
hlatex-fonts-base
imhangul
imhangul-status-applet
mozilla-locale-ko
openoffice.org-help-ko
openoffice.org-l10n-ko
ttf-baekmuk
xfonts-baekmuk
ttf-baekmuk
Task: korean-desktop
Depends: desktop, korean
Section: l10n
Description: Korean desktop
This task makes the desktop be localised in Korean
Key:
Packages:
imhangul-status-applet
mozilla-locale-ko
openoffice.org-help-ko
openoffice.org-l10n-ko
......@@ -11,4 +11,3 @@ Packages:
# fonty
ilithuanian
myspell-lt
kde-i18n-lt
Task: lithuanian-desktop
Depends: desktop, lithuanian
Section: l10n
Maintainer: Kęstutis Biliūnas <kebil@kaunas.init.lt>
Description: Lithuanian desktop
This task makes the desktop be localised in Lithuanian
Key:
Packages:
kde-i18n-lt
......@@ -13,8 +13,5 @@ Packages:
wnorwegian
inorwegian
aspell-no
tetex-brev
kde-i18n-nb
kde-i18n-nn
myspell-nn
myspell-nb
Task: norwegian-desktop
Depends: desktop, norwegian
Section: l10n
Description: Norwegian (Bokmaal and Nynorsk) desktop
This task makes the desktop be localised in Norwegian
Maintainer: Petter Reinholdtsen <pere@debian.org>
Key:
Packages:
kde-i18n-nb
kde-i18n-nn
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -13,10 +13,5 @@ Packages:
ipolish
wpolish
doc-linux-pl
xfonts-biznet-iso-8859-2-base
xfonts-biznet-iso-8859-2-75dpi
manpages-pl-dev
doc-linux-pl-html
xfonts-biznet-iso-8859-2-100dpi
openoffice.org-l10n-pl
kde-i18n-pl
Task: polish-desktop
Depends: desktop, polish
Section: l10n
Description: Polish desktop
This task makes the desktop be localised in Polish
Key:
Packages:
xfonts-biznet-iso-8859-2-base
xfonts-biznet-iso-8859-2-75dpi
xfonts-biznet-iso-8859-2-100dpi
openoffice.org-l10n-pl
kde-i18n-pl
......@@ -14,11 +14,3 @@ Packages:
mueller7-dict
konwert
re
xfonts-bolkhov-koi8r-75dpi
xfonts-bolkhov-koi8r-misc
xfonts-cronyx-koi8r-100dpi
# This package is rarely used, but the Russian support of
# language-env requires it:
xfonts-intl-european
openoffice.org-l10n-ru
kde-i18n-ru
Task: russian-desktop
Depends: desktop, russian
Section: l10n
Description: Russian desktop
This task makes the desktop be localised in Russian
Maintainer: Peter Novodvorsky <nidd@debian.org>
Key:
Packages:
# This package is rarely used, but the Russian support of
# language-env requires it:
xfonts-intl-european
openoffice.org-l10n-ru
kde-i18n-ru
xfonts-bolkhov-koi8r-75dpi
xfonts-bolkhov-koi8r-misc
xfonts-cronyx-koi8r-100dpi
......@@ -22,9 +22,4 @@ Packages:
linux-tutorial-es
# Other packages to i18n common software
util-linux-locales
# Broken at the moment
#mozilla-locale-es
kde-i18n-es
openoffice.org-l10n-es
myspell-es
openoffice.org-help-es
Task: spanish-desktop
Depends: desktop, spanish
Section: l10n
Description: Spanish desktop
This task makes the desktop be localised in Spanish
Key:
Packages:
# Broken at the moment
#mozilla-locale-es
kde-i18n-es
openoffice.org-l10n-es
openoffice.org-help-es
Task: swedish
Test-lang: sv
Section: l10n
Description: Swedish environment
This task installs packages and documentation in Swedish
to help Swedish speaking people use Debian.
Maintainer: Per Olofsson <pelle@dsv.su.se>
Key:
locales
Packages:
util-linux-locales
wswedish
iswedish
aspell-sv
myspell-sv-se
doc-linux-sv-html
Task: swedish-desktop
Depends: desktop, swedish
Section: l10n
Description: Swedish desktop
This task makes the desktop be localised in Swedish
Maintainer: Per Olofsson <pelle@dsv.su.se>
Key:
Packages:
kde-i18n-sv
koffice-i18n-sv
openoffice.org-l10n-sv
......@@ -11,5 +11,3 @@ Packages:
nonlock
cttex
ttmkfdir
kde-i18n-th
openoffice.org-l10n-th
Task: thai-desktop
Depends: desktop, thai
Section: l10n
Description: Thai desktop
This task makes the desktop be localised in Thai
Key:
Packages:
kde-i18n-th
openoffice.org-l10n-th
......@@ -11,5 +11,4 @@ Key:
manpages-tr
Packages:
console-terminus
xfonts-terminus
util-linux-locales
Task: turkish-desktop
Depends: desktop, turkish
Section: l10n
Description: Turkish desktop
This task makes the desktop be localised in Turkish
Maintainer: Recai Oktas <roktas@omu.edu.tr>
Key:
Packages:
xfonts-terminus
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment