Browse Source

Merge remote-tracking branch 'remotes/origin/people/bubulle/bug-545047'

tags/3.12
Joey Hess 9 years ago
parent
commit
daf5989bf0
5 changed files with 22 additions and 19 deletions
  1. +3
    -0
      debian/changelog
  2. +12
    -13
      debian/control
  3. +0
    -5
      tasks/british
  4. +2
    -1
      tasks/british-desktop
  5. +5
    -0
      tasks/english

+ 3
- 0
debian/changelog View File

@@ -18,6 +18,9 @@ tasksel (3.12) UNRELEASED; urgency=low
* Replace apache2-mpm-prefork by apache2. Closes: #678749
* Replace qpopper and uw-imapd by dovecot-{pop3d,imapd} in the mail server
task. Closes: #560696
* Create en "english" task with both British and American
dictionaries and word lists. Consequently drop the "british"
task and modify british-desktop. Closes: #545047
* Changes related to hunspell used in favoir of aspell:
- Add hunspell-ro to romanian-desktop. Closes: #583195
- Add hunspell-be to belarusian-desktop.


+ 12
- 13
debian/control View File

@@ -610,19 +610,6 @@ Depends: ${misc:Depends},
Recommends:
kde-l10n-ptbr

Package: task-british
Architecture: all
Description: British English environment
This task installs packages and documentation in British English
to help British English speaking people use Debian.
XBC-Maintainer: Per Olofsson <pelle@debian.org>
Depends: ${misc:Depends},
locales
Recommends:
util-linux-locales,
ibritish,
wbritish

Package: task-british-desktop
Architecture: all
Description: British English desktop
@@ -964,6 +951,18 @@ Description: Dzongkha KDE desktop
Depends: ${misc:Depends},
Recommends:

Package: task-english
Architecture: all
Description: General English environment
This task installs packages and documentation in British
and American English to help English speaking people use Debian.
Depends: ${misc:Depends},
locales
Recommends:
util-linux-locales,
ibritish,
iamerican

Package: task-esperanto
Architecture: all
Description: Esperanto environment


+ 0
- 5
tasks/british View File

@@ -1,5 +0,0 @@
Task: british
Test-lang: en_GB
Section: l10n
Key:
task-british

+ 2
- 1
tasks/british-desktop View File

@@ -1,5 +1,6 @@
Task: british-desktop
Enhances: desktop, british
Test-lang: en_GB
Enhances: desktop
Section: l10n
Key:
task-british-desktop

+ 5
- 0
tasks/english View File

@@ -0,0 +1,5 @@
Task: english
Test-lang: en
Section: l10n
Key:
task-english

Loading…
Cancel
Save