[debian-edu-commits] debian-edu/ 17/18: tasks/*: Break-up lines with multiple packages, so that there is now only one line per package, preceeded with one blank, and trailing komma after the package name. This makes the tasks files much more machine- parseable. (Plus some fixes spotted while reviewing the files.)

Mike Gabriel sunweaver at debian.org
Sat Aug 5 04:25:59 UTC 2017


This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu.

commit 7736fbb54bc53f92f588ea00622a39bcd615c3e1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 4 18:31:50 2017 -0400

    tasks/*: Break-up lines with multiple packages, so that there is now only one line per package, preceeded with one blank, and trailing komma after the package name. This makes the tasks files much more machine- parseable. (Plus some fixes spotted while reviewing the files.)
---
 debian/changelog             |   4 +
 tasks/astronomy              |  18 +-
 tasks/chemistry              |  15 +-
 tasks/common                 | 530 +++++++++++++++++++++++-----------
 tasks/desktop-gnome          |  35 ++-
 tasks/desktop-kde            |  91 ++++--
 tasks/desktop-lxde           |  32 ++-
 tasks/desktop-mate           |  33 ++-
 tasks/desktop-other          | 655 ++++++++++++++++++++++++++-----------------
 tasks/desktop-xfce           |  14 +-
 tasks/development            |  57 ++--
 tasks/electronics            |  21 +-
 tasks/geography              |  42 ++-
 tasks/graphics               |  18 +-
 tasks/lang-da                |   4 +-
 tasks/lang-da-desktop        |  11 +-
 tasks/lang-da-desktop-kde    |   5 +-
 tasks/lang-de                |   6 +-
 tasks/lang-de-desktop        |  18 +-
 tasks/lang-de-desktop-kde    |   5 +-
 tasks/lang-es                |   4 +-
 tasks/lang-es-desktop        |  13 +-
 tasks/lang-es-desktop-kde    |   5 +-
 tasks/lang-fr                |   4 +-
 tasks/lang-fr-desktop        |  19 +-
 tasks/lang-fr-desktop-kde    |   5 +-
 tasks/lang-he                |   4 +-
 tasks/lang-he-desktop        |  12 +-
 tasks/lang-he-desktop-kde    |   5 +-
 tasks/lang-it                |   4 +-
 tasks/lang-it-desktop        |  13 +-
 tasks/lang-it-desktop-kde    |   5 +-
 tasks/lang-ja                |   2 +-
 tasks/lang-ja-desktop        |  16 +-
 tasks/lang-ja-desktop-kde    |   5 +-
 tasks/lang-no                |   7 +-
 tasks/lang-no-desktop        |  14 +-
 tasks/lang-no-desktop-kde    |   5 +-
 tasks/lang-se                |   2 +-
 tasks/lang-zh-tw             |   2 +-
 tasks/lang-zh-tw-desktop     |  14 +-
 tasks/lang-zh-tw-desktop-kde |   5 +-
 tasks/language               |  27 +-
 tasks/laptop                 |  25 +-
 tasks/logic-games            |  15 +-
 tasks/ltsp-server            |  50 ++--
 tasks/main-server            | 192 ++++++++-----
 tasks/mathematics            |  41 ++-
 tasks/misc                   |  24 +-
 tasks/music                  |  38 ++-
 tasks/networked              |   8 +-
 tasks/networked-common       |  75 ++---
 tasks/physics                |  12 +-
 tasks/roaming-workstation    |  19 +-
 tasks/services               |   4 +-
 tasks/standalone             |  10 +-
 tasks/thin-client            |  10 +-
 tasks/workstation            |  15 +-
 58 files changed, 1500 insertions(+), 844 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7dae92f..d73c747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ debian-edu (1.925) UNRELEASED; urgency=medium
   * tasks/*: Remove trailing backslashes. Not required anymore.
   * tasks/*: Drop Homepage: License: and Pkg-Description fields. Will soon
     not be supported anymore. (Thanks to Andreas Tille for informing us).
+  * tasks/*: Break-up lines with multiple packages, so that there is now
+    only one line per package, preceeded with one blank, and trailing komma
+    after the package name. This makes the tasks files much more machine-
+    parseable.
 
  -- Mike Gabriel <sunweaver at debian.org>  Fri, 04 Aug 2017 15:47:02 -0400
 
diff --git a/tasks/astronomy b/tasks/astronomy
index d049edb..217a468 100644
--- a/tasks/astronomy
+++ b/tasks/astronomy
@@ -7,13 +7,21 @@ Description: Debian Edu astronomy related applications
  teach astronomy.
 
 Depends:
- celestia-gnome | celestia-glut | celestia
+ celestia-gnome | celestia-glut | celestia,
 
 Depends:
- gpredict, stellarium, xplanet, xplanet-images, kstars
+ gpredict,
+ stellarium,
+ xplanet,
+ xplanet-images,
+ kstars,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- sunclock, xtide, xtide-data
+ sunclock,
+ xtide,
+ xtide-data,
 Ignore:
- astronomical-almanac, lightspeed, openuniverse
+ astronomical-almanac,
+ lightspeed,
+ openuniverse,
diff --git a/tasks/chemistry b/tasks/chemistry
index 1ee0226..4a20588 100644
--- a/tasks/chemistry
+++ b/tasks/chemistry
@@ -7,9 +7,16 @@ Description: Debian Edu chemistry related applications
  teach chemistry.
 
 Depends:
- avogadro, easychem, gchempaint, gdis, pymol,
-         viewmol, gperiodic, chemtool, kalzium
+ avogadro,
+ easychem,
+ gchempaint,
+ gdis,
+ pymol,
+ viewmol,
+ gperiodic,
+ chemtool,
+ kalzium,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- rasmol
+ rasmol,
diff --git a/tasks/common b/tasks/common
index efb3d58..bbff1af 100644
--- a/tasks/common
+++ b/tasks/common
@@ -7,239 +7,453 @@ Description: Debian Edu common packages
  installations in the Debian Edu Blend.
 
 Depends:
- rsyslog
-NeedConfig:  yes - Todo
+ rsyslog,
+NeedConfig: yes - Todo
+
 Suggests:
- rsyslog-doc
+ rsyslog-doc,
 DontAvoid:
  sysklogd (can't avoid this one yet, debootstrap lists it as required)
 
 Depends:
- procinfo
+ procinfo,
 
 Depends:
- openssh-client
+ openssh-client,
 Avoid:
- ssh-askpass
+ ssh-askpass,
 
 Depends:
- cfengine2
-NeedConfig:  yes
+ cfengine2,
+NeedConfig: yes
 
 Depends:
- vim
+ vim,
 Avoid:
- vim-gnome, vim-gtk, vim-lesstif, vim-nox
+ vim-gnome,
+ vim-gtk,
+ vim-lesstif,
+ vim-nox,
 
 Suggests:
- emacs
+ emacs,
 
 Depends:
- nullidentd | ident-server, openbsd-inetd
+ nullidentd | ident-server,
+ openbsd-inetd,
 
 Depends:
- man-db, manpages, ethtool, hdparm, pciutils,
-             nictools-pci, apt-listchanges,
-             debian-archive-keyring,
-             resolvconf, psmisc, mii-diag, lsscsi,
-             sysfsutils, etherwake, mlocate
+ man-db,
+ manpages,
+ ethtool,
+ hdparm,
+ pciutils,
+ nictools-pci,
+ apt-listchanges,
+ debian-archive-keyring,
+ resolvconf,
+ psmisc,
+ mii-diag,
+ lsscsi,
+ sysfsutils,
+ etherwake,
+ mlocate,
 Recommends:
- iputils-arping | arping, finger, gdebi-core | gdebi
+ iputils-arping | arping,
+ finger,
+ gdebi-core | gdebi,
 Suggests:
- apticron | cron-apt, nictools-nopci, nvram-wakeup, debsecan
+ apticron | cron-apt,
+ nictools-nopci,
+ nvram-wakeup,
+ debsecan,
 
 Depends:
- reportbug
+ reportbug,
 Recommends:
- python-gtk2, python-vte
+ python-gtk2,
+ python-vte,
 
 Depends:
- bind9-host, traceroute, tcptraceroute, iftop, less,
-             tcpdump, bc, wget, strace, nmap, eject, libwww-perl,
-             mtools, ncftp, dmidecode, hwinfo, procmail, iproute2 | iproute,
-             mtr-tiny | mtr, fping, iotop
+ bind9-host,
+ traceroute,
+ tcptraceroute,
+ iftop,
+ less,
+ tcpdump,
+ bc,
+ wget,
+ strace,
+ nmap,
+ eject,
+ libwww-perl,
+ mtools,
+ ncftp,
+ dmidecode,
+ hwinfo,
+ procmail,
+ iproute2 | iproute,
+ mtr-tiny | mtr,
+ fping,
+ iotop,
 Recommends:
- rsync, memtest86+, deborphan, hddtemp, htop, screen, mc,
-             lshw, dhcping, convmv, system-config-lvm
+ rsync,
+ memtest86+,
+ deborphan,
+ hddtemp,
+ htop,
+ screen,
+ mc,
+ lshw,
+ dhcping,
+ convmv,
+ system-config-lvm,
 Suggests:
  dpt-i2o-raidutils | raidutils,
-             cpqarrayd, arrayprobe, mpt-status,
-             isag, modconf, wireshark
+ cpqarrayd,
+ arrayprobe,
+ mpt-status,
+ isag,
+ modconf,
+ wireshark,
 Ignore:
- smartmontools | smartsuite, smart-notifier,
-             rkhunter
+ smartmontools | smartsuite,
+ smart-notifier,
+ rkhunter,
 
 Recommends:
- gdb, valgrind
+ gdb,
+ valgrind,
 
 Depends:
- debian-edu-doc-en
+ debian-edu-doc-en,
 
 Depends:
- debian-edu-config, debian-edu-install, debconf-utils
+ debian-edu-config,
+ debian-edu-install,
+ debconf-utils,
 
 Suggests:
- popularity-contest, debian-goodies
-NeedConfig:  yes - get it to submit to both debian and debian-edu.
+ popularity-contest,
+ debian-goodies,
+NeedConfig: yes - get it to submit to both debian and debian-edu.
 
 Depends:
- consolekit, libpam-ck-connector
+ consolekit,
+ libpam-ck-connector,
 
 Recommends:
- libpam-tmpdir
+ libpam-tmpdir,
 
 Recommends:
- libnss-myhostname
+ libnss-myhostname,
 
 Depends:
- unattended-upgrades
+ unattended-upgrades,
 
 Suggests:
- kexec-tools
+ kexec-tools,
 
 Ignore:
  apache2-mpm-worker,
-             brltty, brltty-x11,
-             capiutils,
-             diveintopython,
-             espeak, gamin, gnome-user-guide,
-             gnome-terminal, gpaint, ipppd,
-             isdnutils-base, isdnutils-xtools, jfsutils,
-             language-support-en,
-             linux-wlan-ng, mcpp, min12xxw, mouseemu,
-             mozilla-firefox-locale-en-gb,
-             pppdcapiplugin,
-             python-notify,
-             scim-gtk2-immodule, scim-modules-socket,
-             scim-modules-table, scim-tables-additional,
-             sessreg, thunar, fonts-arabeyes,
-             fonts-beng, fonts-deva,
-             fonts-gujr, fonts-indic, fonts-knda,
-             fonts-lao, fonts-mlym, fonts-orya,
-             fonts-guru, fonts-taml, fonts-telu,
-             fonts-thai-tlwg, w3m,
-             wamerican, xfce4-terminal, xfdesktop4,
-             xfsprogs, xkeyboard-config, xmessage, xpmutils
+ brltty,
+ brltty-x11,
+ capiutils,
+ diveintopython,
+ espeak,
+ gamin,
+ gnome-user-guide,
+ gnome-terminal,
+ gpaint,
+ ipppd,
+ isdnutils-base,
+ isdnutils-xtools,
+ jfsutils,
+ language-support-en,
+ linux-wlan-ng,
+ mcpp,
+ min12xxw,
+ mouseemu,
+ mozilla-firefox-locale-en-gb,
+ pppdcapiplugin,
+ python-notify,
+ scim-gtk2-immodule,
+ scim-modules-socket,
+ scim-modules-table,
+ scim-tables-additional,
+ sessreg,
+ thunar,
+ fonts-arabeyes,
+ fonts-beng,
+ fonts-deva,
+ fonts-gujr,
+ fonts-indic,
+ fonts-knda,
+ fonts-lao,
+ fonts-mlym,
+ fonts-orya,
+ fonts-guru,
+ fonts-taml,
+ fonts-telu,
+ fonts-thai-tlwg,
+ w3m,
+ wamerican,
+ xfce4-terminal,
+ xfdesktop4,
+ xfsprogs,
+ xkeyboard-config,
+ xmessage,
+ xpmutils,
 
 Ignore:
- tofrodos, gocr, quota, cervisia,
-             gphoto2, kompare, pwgen
+ tofrodos,
+ gocr,
+ quota,
+ cervisia,
+ gphoto2,
+ kompare,
+ pwgen,
 
 Ignore:
- dc, doc-debian, iamerican, ibritish, ispell,
-             mpack, mutt, python-newt,
-             tcsh, texinfo, time, w3m, akregator,
-             blinken, cdparanoia, edict
+ dc,
+ doc-debian,
+ iamerican,
+ ibritish,
+ ispell,
+ mpack,
+ mutt,
+ python-newt,
+ tcsh,
+ texinfo,
+ time,
+ w3m,
+ akregator,
+ blinken,
+ cdparanoia,
+ edict,
 
 Ignore:
- backuppc, rsync, libfile-rsyncp-perl
-NeedConfig:  yes
+ backuppc,
+ rsync,
+ libfile-rsyncp-perl,
+NeedConfig: yes
 
 Avoid:
- xmail, ssmtp, smail, sendmail-bin, postfix, nullmailer, nbsmtp,
-             msmtp-mta, masqmail, esmtp-run, courier-mta
+ xmail,
+ ssmtp,
+ smail,
+ sendmail-bin,
+ postfix,
+ nullmailer,
+ nbsmtp,
+ msmtp-mta,
+ masqmail,
+ esmtp-run,
+ courier-mta,
 
 Avoid:
- libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-oss,
-             libsdl1.2debian-nas, atlas3-base, atlas3-sse,
-             atlas3-sse2, atlas3-3dnow, elilo, acorn-fdisk,
-             aspell-fo, biff, bison, bootp, choose-mirror, gpm,
-             gs-aladdin, ipmasqadm, mailutils, net-retriever,
-             netcfg-static, palo, pidentd, postfix-ldap, postfix-pcre,
-             inetutils-ping, netkit-ping, python-newt, sendmail-doc,
-             vacation, libsasl2-modules-mysql,
-             efibootmgr, amiga-fdisk-cross, delo, elvis-tiny,
-             kbd-compat, file-rc, nagios-mysql, nagios-pgsql,
-             realtime-lsm, realtime-lsm-source, debconf-english,
-             bin86, console-cyrillic, fbset, flex, gnu-efi,
-             gs-afpl, inetutils-inetd, inetutils-syslogd, jfbterm,
-             jfsutils, libgnutls12, libc6-amd64, libtextwrap1,
-             libconfigfile-perl, libgamin0, libident,
-             libnss-db, reiserfsprogs, update, yaird, socklog-run,
-             syslog-ng, apache2-mpm-perchild,
-             nas-bin, initrd-tools,
-             console-keymaps-acorn, console-keymaps-amiga,
-             console-keymaps-atari, console-keymaps-dec,
-             console-keymaps-sun, kaffe, sablevm, jikes, 9wm, aewm,
-             afterstep, aterm, aterm-ml, blackbox,
-             ctwm, enlightenment, evilwm, fluxbox, fvwm, fvwm-gnome,
-             fvwm1, fvwm95, habak, hanterm-xf, icewm, ion2, ion3, jwm,
-             kterm, mlterm, mlterm-tiny, mrxvt, multi-gnome-terminal,
-             pterm, ratpoison, rxvt, terminal.app, wterm, wterm-ml,
-             xfsprogs, sysv-rc-bootsplash,
-             cdebconf-udeb, libdebian-installer4-udeb,
-             libtextwrap1-udeb, libslang1-utf8-udeb, php5-cgi,
-             libsigc++-1.2-5c2, expect-tcl8.3, tk8.3, gobjc-4.2, gobjc++-4.2,
-             gfortran-4.2, aptitude-doc-cs, aptitude-doc-en,
-             aptitude-doc-fi, aptitude-doc-fr
+ libsdl1.2debian-all,
+ libsdl1.2debian-arts,
+ libsdl1.2debian-oss,
+ libsdl1.2debian-nas,
+ atlas3-base,
+ atlas3-sse,
+ atlas3-sse2,
+ atlas3-3dnow,
+ elilo,
+ acorn-fdisk,
+ aspell-fo,
+ biff,
+ bison,
+ bootp,
+ choose-mirror,
+ gpm,
+ gs-aladdin,
+ ipmasqadm,
+ mailutils,
+ net-retriever,
+ netcfg-static,
+ palo,
+ pidentd,
+ postfix-ldap,
+ postfix-pcre,
+ inetutils-ping,
+ netkit-ping,
+ python-newt,
+ sendmail-doc,
+ vacation,
+ libsasl2-modules-mysql,
+ efibootmgr,
+ amiga-fdisk-cross,
+ delo,
+ elvis-tiny,
+ kbd-compat,
+ file-rc,
+ nagios-mysql,
+ nagios-pgsql,
+ realtime-lsm,
+ realtime-lsm-source,
+ debconf-english,
+ bin86,
+ console-cyrillic,
+ fbset,
+ flex,
+ gnu-efi,
+ gs-afpl,
+ inetutils-inetd,
+ inetutils-syslogd,
+ jfbterm,
+ jfsutils,
+ libgnutls12,
+ libc6-amd64,
+ libtextwrap1,
+ libconfigfile-perl,
+ libgamin0,
+ libident,
+ libnss-db,
+ reiserfsprogs,
+ update,
+ yaird,
+ socklog-run,
+ syslog-ng,
+ apache2-mpm-perchild,
+ nas-bin,
+ initrd-tools,
+ console-keymaps-acorn,
+ console-keymaps-amiga,
+ console-keymaps-atari,
+ console-keymaps-dec,
+ console-keymaps-sun,
+ kaffe,
+ sablevm,
+ jikes,
+ 9wm,
+ aewm,
+ afterstep,
+ aterm,
+ aterm-ml,
+ blackbox,
+ ctwm,
+ enlightenment,
+ evilwm,
+ fluxbox,
+ fvwm,
+ fvwm-gnome,
+ fvwm1,
+ fvwm95,
+ habak,
+ hanterm-xf,
+ icewm,
+ ion2,
+ ion3,
+ jwm,
+ kterm,
+ mlterm,
+ mlterm-tiny,
+ mrxvt,
+ multi-gnome-terminal,
+ pterm,
+ ratpoison,
+ rxvt,
+ terminal.app,
+ wterm,
+ wterm-ml,
+ xfsprogs,
+ sysv-rc-bootsplash,
+ cdebconf-udeb,
+ libdebian-installer4-udeb,
+ libtextwrap1-udeb,
+ libslang1-utf8-udeb,
+ php5-cgi,
+ libsigc++-1.2-5c2,
+ expect-tcl8.3,
+ tk8.3,
+ gobjc-4.2,
+ gobjc++-4.2,
+ gfortran-4.2,
+ aptitude-doc-cs,
+ aptitude-doc-en,
+ aptitude-doc-fi,
+ aptitude-doc-fr,
 
 Avoid:
- linux-image-2.6-powerpc-smp, linux-image-2.6.32-5-powerpc-smp,
-             affs-modules-2.6.32-5-powerpc64-di,
-             ata-modules-2.6.32-5-powerpc64-di,
-             core-modules-2.6.32-5-powerpc64-di,
-             crypto-dm-modules-2.6.32-5-powerpc64-di,
-             crypto-modules-2.6.32-5-powerpc64-di,
-             ext2-modules-2.6.32-5-powerpc64-di,
-             ext3-modules-2.6.32-5-powerpc64-di,
-             ext4-modules-2.6.32-5-powerpc64-di,
-             fancontrol-modules-2.6.32-5-powerpc64-di,
-             fat-modules-2.6.32-5-powerpc64-di,
-             floppy-modules-2.6.32-5-powerpc64-di,
-             hfs-modules-2.6.32-5-powerpc64-di,
-             hypervisor-modules-2.6.32-5-powerpc64-di,
-             irda-modules-2.6.32-5-powerpc64-di,
-             isofs-modules-2.6.32-5-powerpc64-di,
-             jfs-modules-2.6.32-5-powerpc64-di,
-             linux-image-2.6-powerpc64,
-             linux-image-2.6.32-5-powerpc64,
-             loop-aes-modules-2.6.30-2-powerpc64-di,
-             loop-modules-2.6.32-5-powerpc64-di,
-             md-modules-2.6.32-5-powerpc64-di,
-             multipath-modules-2.6.32-5-powerpc64-di,
-             nic-extra-modules-2.6.32-5-powerpc64-di,
-             nic-modules-2.6.32-5-powerpc64-di,
-             nic-pcmcia-modules-2.6.32-5-powerpc64-di,
-             nic-shared-modules-2.6.32-5-powerpc64-di,
-             nls-core-modules-2.6.32-5-powerpc64-di,
-             pata-modules-2.6.32-5-powerpc64-di,
-             pcmcia-modules-2.6.32-5-powerpc64-di,
-             pcmcia-storage-modules-2.6.32-5-powerpc64-di,
-             ppp-modules-2.6.32-5-powerpc64-di,
-             reiserfs-modules-2.6.32-5-powerpc64-di,
-             sata-modules-2.6.32-5-powerpc64-di,
-             scsi-extra-modules-2.6.32-5-powerpc64-di,
-             serial-modules-2.6.32-5-powerpc64-di,
-             squashfs-modules-2.6.32-5-powerpc64-di,
-             ufs-modules-2.6.32-5-powerpc64-di,
-             uinput-modules-2.6.32-5-powerpc64-di,
-             usb-serial-modules-2.6.32-5-powerpc64-di,
-             xfs-modules-2.6.32-5-powerpc64-di
+ linux-image-2.6-powerpc-smp,
+ linux-image-2.6.32-5-powerpc-smp,
+ affs-modules-2.6.32-5-powerpc64-di,
+ ata-modules-2.6.32-5-powerpc64-di,
+ core-modules-2.6.32-5-powerpc64-di,
+ crypto-dm-modules-2.6.32-5-powerpc64-di,
+ crypto-modules-2.6.32-5-powerpc64-di,
+ ext2-modules-2.6.32-5-powerpc64-di,
+ ext3-modules-2.6.32-5-powerpc64-di,
+ ext4-modules-2.6.32-5-powerpc64-di,
+ fancontrol-modules-2.6.32-5-powerpc64-di,
+ fat-modules-2.6.32-5-powerpc64-di,
+ floppy-modules-2.6.32-5-powerpc64-di,
+ hfs-modules-2.6.32-5-powerpc64-di,
+ hypervisor-modules-2.6.32-5-powerpc64-di,
+ irda-modules-2.6.32-5-powerpc64-di,
+ isofs-modules-2.6.32-5-powerpc64-di,
+ jfs-modules-2.6.32-5-powerpc64-di,
+ linux-image-2.6-powerpc64,
+ linux-image-2.6.32-5-powerpc64,
+ loop-aes-modules-2.6.30-2-powerpc64-di,
+ loop-modules-2.6.32-5-powerpc64-di,
+ md-modules-2.6.32-5-powerpc64-di,
+ multipath-modules-2.6.32-5-powerpc64-di,
+ nic-extra-modules-2.6.32-5-powerpc64-di,
+ nic-modules-2.6.32-5-powerpc64-di,
+ nic-pcmcia-modules-2.6.32-5-powerpc64-di,
+ nic-shared-modules-2.6.32-5-powerpc64-di,
+ nls-core-modules-2.6.32-5-powerpc64-di,
+ pata-modules-2.6.32-5-powerpc64-di,
+ pcmcia-modules-2.6.32-5-powerpc64-di,
+ pcmcia-storage-modules-2.6.32-5-powerpc64-di,
+ ppp-modules-2.6.32-5-powerpc64-di,
+ reiserfs-modules-2.6.32-5-powerpc64-di,
+ sata-modules-2.6.32-5-powerpc64-di,
+ scsi-extra-modules-2.6.32-5-powerpc64-di,
+ serial-modules-2.6.32-5-powerpc64-di,
+ squashfs-modules-2.6.32-5-powerpc64-di,
+ ufs-modules-2.6.32-5-powerpc64-di,
+ uinput-modules-2.6.32-5-powerpc64-di,
+ usb-serial-modules-2.6.32-5-powerpc64-di,
+ xfs-modules-2.6.32-5-powerpc64-di
 
 Ignore:
- tmpreaper
+ tmpreaper,
 
 Suggests:
- firmware-bnx2, firmware-ipw2x00, firmware-iwlwifi, firmware-qlogic,
-             firmware-ralink
+ firmware-bnx2,
+ firmware-ipw2x00,
+ firmware-iwlwifi,
+ firmware-qlogic,
+ firmware-ralink,
 
 Depends:
- cups, foomatic-db, foomatic-db-engine, foomatic-db-gutenprint,
-             cups-filters | foomatic-filters,
-             cups-browsed, printer-driver-pnm2ppa,
-             printer-driver-hpijs, hpijs-ppds, hplip, ijsgutenprint
+ cups,
+ foomatic-db,
+ foomatic-db-engine,
+ foomatic-db-gutenprint,
+ cups-filters | foomatic-filters,
+ cups-browsed,
+ printer-driver-pnm2ppa,
+ printer-driver-hpijs,
+ hpijs-ppds,
+ hplip,
+ ijsgutenprint,
 Suggests:
- foo2zjs
+ foo2zjs,
 Ignore:
- escputil
+ escputil,
 Avoid:
- lpr
+ lpr,
 
 Recommends:
- bash-completion
+ bash-completion,
 
 Depends:
- cifs-utils
+ cifs-utils,
 
 Recommends:
- command-not-found
+ command-not-found,
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index a4fd083..05b6dbd 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -8,26 +8,37 @@ Description: Debian Edu GNOME desktop applications
  that are useful for teachers and their students.
 
 Depends:
- education-common
+ education-common,
 
 Depends:
  gdm3 | x-display-manager,
-              gnome, gimp,
-              inkscape,
-              synaptic
+ gnome,
+ gimp,
+ inkscape,
+ synaptic,
 Suggests:
- dasher, gnome-mag, gok,
-              gnome-accessibility-themes,  gnome-orca
+ dasher,
+ gnome-mag,
+ gok,
+ gnome-accessibility-themes,
+ gnome-orca,
 Avoid:
- xdm
+ xdm,
 
 Depends:
- libreoffice-gnome, libreoffice-gtk3,  libreoffice-writer,
-              libreoffice-calc, libreoffice-impress, libreoffice-draw,
-              libreoffice-math, libreoffice-base, libreoffice-filter-binfilter, libreoffice-java-common
+ libreoffice-gnome,
+ libreoffice-gtk3,
+ libreoffice-writer,
+ libreoffice-calc,
+ libreoffice-impress,
+ libreoffice-draw,
+ libreoffice-math,
+ libreoffice-base,
+ libreoffice-filter-binfilter,
+ libreoffice-java-common,
 
 Depends:
- totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
+ totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer,
 
 Recommends:
- ssh-askpass-gnome | ssh-askpass
+ ssh-askpass-gnome | ssh-askpass,
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index b8bac62..45e4374 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -8,55 +8,86 @@ Description: Debian Edu KDE desktop applications
  that are useful for teachers and their students.
 
 Depends:
- education-common
+ education-common,
 
 Depends:
- kde-standard, kwin-x11, konqueror,
-             konsole, kmix, kdepasswd
+ kde-standard,
+ kwin-x11,
+ konqueror,
+ konsole,
+ kmix,
+ kdepasswd,
 Recommends:
- kcalc, ark, kmail, kaddressbook, kcharselect,
-             kdf, kde-spectacle, korganizer, konversation | kopete,
-             konq-plugins, kio-audiocd,
-             kdegraphics-thumbnailers,
-             kfloppy, knotes, clementine,
-             plasma-workspace-wallpapers, kdeutils, kamera, digikam,
-             kipi-plugins,
-             kdeaccessibility,
-             kturtle
+ kcalc,
+ ark,
+ kmail,
+ kaddressbook,
+ kcharselect,
+ kdf,
+ kde-spectacle,
+ korganizer,
+ konversation | kopete,
+ konq-plugins,
+ kio-audiocd,
+ kdegraphics-thumbnailers,
+ kfloppy,
+ knotes,
+ clementine,
+ plasma-workspace-wallpapers,
+ kdeutils,
+ kamera,
+ digikam,
+ kipi-plugins,
+ kdeaccessibility,
+ kturtle,
 Suggests:
- knode, kde-config-cron, kuser, kscd, kfind,
-             kruler, kfilereplace, kde-zeroconf,
-             kde-full
+ knode,
+ kde-config-cron,
+ kuser,
+ kscd,
+ kfind,
+ kruler,
+ kfilereplace,
+ kde-zeroconf,
+ kde-full,
 
 Recommends:
- bluedevil
+ bluedevil,
 
 Depends:
- lightdm | x-display-manager
+ lightdm | x-display-manager,
 Avoid:
- xdm
-NeedConfig:  yes - artwork
+ xdm,
+NeedConfig: yes - artwork
 
 Depends:
- dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer
+ dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer,
 
 Depends:
- kdeedu
+ kdeedu,
 Recommends:
- print-manager, kwalletmanager,
-             kinfocenter
+ print-manager,
+ kwalletmanager,
+ kinfocenter,
 
 Recommends:
- krfb, krdc
+ krfb,
+ krdc,
 
 Recommends:
- kde-l10n-es, kde-l10n-it, kde-l10n-de, kde-l10n-fr,
-             kde-l10n-lv, kde-l10n-el, kde-l10n-ptbr,
-             kde-l10n-nl, kde-l10n-ca,
-             kde-l10n-sv
+ kde-l10n-es,
+ kde-l10n-it,
+ kde-l10n-de,
+ kde-l10n-fr,
+ kde-l10n-lv,
+ kde-l10n-el,
+ kde-l10n-ptbr,
+ kde-l10n-nl,
+ kde-l10n-ca,
+ kde-l10n-sv,
 
 Recommends:
- libreoffice-kde
+ libreoffice-kde,
 
 Recommends:
- ksshaskpass | ssh-askpass
+ ksshaskpass | ssh-askpass,
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index 472be74..2b31af0 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -8,27 +8,35 @@ Description: Debian Edu LXDE desktop applications
  desktop applications that are useful for teachers and their students.
 
 Depends:
- education-common
+ education-common,
 
 Depends:
- lxde, desktop-file-utils
+ lxde,
+ desktop-file-utils,
 Recommends:
- evince, galculator, osmo, parcellite,
-              pidgin, hexchat, mtpaint, fotoxx, gimp,
-              inkscape,
-              synaptic
+ evince,
+ galculator,
+ osmo,
+ parcellite,
+ pidgin,
+ hexchat,
+ mtpaint,
+ fotoxx,
+ gimp,
+ inkscape,
+ synaptic,
 
 Recommends:
- blueman
+ blueman,
 
 Depends:
- lightdm | x-display-manager
+ lightdm | x-display-manager,
 Avoid:
- xdm
-NeedConfig:   yes - artwork
+ xdm,
+NeedConfig: yes - artwork
 
 Depends:
- totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
+ totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer,
 
 Recommends:
- ssh-askpass
+ ssh-askpass,
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index 138d0b4..8f094f4 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -8,26 +8,35 @@ Description: Debian Edu MATE desktop applications
  that are useful for teachers and their students.
 
 Depends:
- education-common
+ education-common,
 
 Depends:
  lightdm | x-display-manager,
-              mate-desktop-environment, mate-desktop-environment-extras,
-              mate-settings-daemon-pulse, mate-media-pulse,
-              gimp, inkscape,
-              synaptic
+ mate-desktop-environment,
+ mate-desktop-environment-extras,
+ mate-settings-daemon-pulse,
+ mate-media-pulse,
+ gimp,
+ inkscape,
+ synaptic,
 Suggests:
- dasher
+ dasher,
 Avoid:
- xdm
+ xdm,
 
 Depends:
- libreoffice-gtk2,  libreoffice-writer,
-              libreoffice-calc, libreoffice-impress, libreoffice-draw,
-              libreoffice-math, libreoffice-base, libreoffice-filter-binfilter, libreoffice-java-common
+ libreoffice-gtk2,
+ libreoffice-writer,
+ libreoffice-calc,
+ libreoffice-impress,
+ libreoffice-draw,
+ libreoffice-math,
+ libreoffice-base,
+ libreoffice-filter-binfilter,
+ libreoffice-java-common,
 
 Depends:
- vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer
+ vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer,
 
 Recommends:
- ssh-askpass-gnome | ssh-askpass
+ ssh-askpass-gnome | ssh-askpass,
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 7b6dc59..ea60806 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -7,425 +7,554 @@ Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
  that are useful for teachers and their students.
 
 Depends:
- xorg, xserver-xorg-input-all, xserver-xorg-video-all, libgl1-mesa-dri,
-             numlockx, unifont, gsfonts-x11,
-             xfonts-75dpi-transcoded,
-             fonts-freefont-ttf, fonts-liberation, fonts-linex
+ xorg,
+ xserver-xorg-input-all,
+ xserver-xorg-video-all,
+ libgl1-mesa-dri,
+ numlockx,
+ unifont,
+ gsfonts-x11,
+ xfonts-75dpi-transcoded,
+ fonts-freefont-ttf,
+ fonts-liberation,
+ fonts-linex,
 Suggests:
- xfonts-100dpi-transcoded, fonts-mlym
+ xfonts-100dpi-transcoded,
+ fonts-mlym,
 
 Suggests:
- fonts-larabie-deco
+ fonts-larabie-deco,
 
 Depends:
- synaptic
+ synaptic,
 
 Depends:
- alsa-utils
+ alsa-utils,
 
 Depends:
  gcj-jre-headless,
-             libreoffice
+ libreoffice,
 Recommends:
  libreoffice-l10n-el,
-             libreoffice-l10n-de,
-             libreoffice-l10n-fr,
-             libreoffice-l10n-es,
-             libreoffice-l10n-ca,
-             libreoffice-l10n-nl,
-             libreoffice-l10n-sv,
-             libreoffice-l10n-pt-br,
-             libreoffice-help-el,
-             libreoffice-help-fr,
-             libreoffice-help-es,
-             libreoffice-help-sv,
-             libreoffice-help-pt-br,
-             openclipart-libreoffice, openclipart
+ libreoffice-l10n-de,
+ libreoffice-l10n-fr,
+ libreoffice-l10n-es,
+ libreoffice-l10n-ca,
+ libreoffice-l10n-nl,
+ libreoffice-l10n-sv,
+ libreoffice-l10n-pt-br,
+ libreoffice-help-el,
+ libreoffice-help-fr,
+ libreoffice-help-es,
+ libreoffice-help-sv,
+ libreoffice-help-pt-br,
+ openclipart-libreoffice,
+ openclipart,
 Suggests:
  libreoffice-filter-binfilter,
-             libreoffice-l10n-en-za,
-             libreoffice-help-zh-tw,
-             libreoffice-l10n-zh-tw,
-             libreoffice-style-crystal,
-             mythes-en-us
+ libreoffice-l10n-en-za,
+ libreoffice-help-zh-tw,
+ libreoffice-l10n-zh-tw,
+ libreoffice-style-crystal,
+ mythes-en-us,
 Ignore:
  libreoffice-help-cs,
-             libreoffice-help-de,
-             libreoffice-help-dz,
-             libreoffice-help-en-gb,
-             libreoffice-help-en-us,
-             libreoffice-help-et,
-             libreoffice-help-hu,
-             libreoffice-help-it,
-             libreoffice-help-km,
-             libreoffice-help-ko,
-             libreoffice-help-nl,
-             libreoffice-help-pl,
-             libreoffice-help-ru,
-             libreoffice-help-sl,
-             libreoffice-help-zh-cn,
-             libreoffice-l10n-af,
-             libreoffice-l10n-bg,
-             libreoffice-l10n-bn,
-             libreoffice-l10n-br,
-             libreoffice-l10n-bs,
-             libreoffice-l10n-cs,
-             libreoffice-l10n-cy,
-             libreoffice-l10n-dz,
-             libreoffice-l10n-en-gb,
-             libreoffice-l10n-eo,
-             libreoffice-l10n-et,
-             libreoffice-l10n-fa,
-             libreoffice-l10n-fi,
-             libreoffice-l10n-fr,
-             libreoffice-l10n-ga,
-             libreoffice-l10n-he,
-             libreoffice-l10n-hi,
-             libreoffice-l10n-hr,
-             libreoffice-l10n-hu,
-             libreoffice-l10n-in,
-             libreoffice-l10n-it,
-             libreoffice-l10n-ka,
-             libreoffice-l10n-km,
-             libreoffice-l10n-ko,
-             libreoffice-l10n-ku,
-             libreoffice-l10n-lt,
-             libreoffice-l10n-lv,
-             libreoffice-l10n-mk,
-             libreoffice-l10n-ne,
-             libreoffice-l10n-nr,
-             libreoffice-l10n-pa-in,
-             libreoffice-l10n-pl,
-             libreoffice-l10n-pt,
-             libreoffice-l10n-ru,
-             libreoffice-l10n-rw,
-             libreoffice-l10n-sk,
-             libreoffice-l10n-sl,
-             libreoffice-l10n-ss,
-             libreoffice-l10n-st,
-             libreoffice-l10n-tg,
-             libreoffice-l10n-th,
-             libreoffice-l10n-tn,
-             libreoffice-l10n-tr,
-             libreoffice-l10n-ts,
-             libreoffice-l10n-uk,
-             libreoffice-l10n-ve,
-             libreoffice-l10n-vi,
-             libreoffice-l10n-xh,
-             libreoffice-l10n-za,
-             libreoffice-l10n-zh-cn,
-             libreoffice-l10n-zu
+ libreoffice-help-de,
+ libreoffice-help-dz,
+ libreoffice-help-en-gb,
+ libreoffice-help-en-us,
+ libreoffice-help-et,
+ libreoffice-help-hu,
+ libreoffice-help-it,
+ libreoffice-help-km,
+ libreoffice-help-ko,
+ libreoffice-help-nl,
+ libreoffice-help-pl,
+ libreoffice-help-ru,
+ libreoffice-help-sl,
+ libreoffice-help-zh-cn,
+ libreoffice-l10n-af,
+ libreoffice-l10n-bg,
+ libreoffice-l10n-bn,
+ libreoffice-l10n-br,
+ libreoffice-l10n-bs,
+ libreoffice-l10n-cs,
+ libreoffice-l10n-cy,
+ libreoffice-l10n-dz,
+ libreoffice-l10n-en-gb,
+ libreoffice-l10n-eo,
+ libreoffice-l10n-et,
+ libreoffice-l10n-fa,
+ libreoffice-l10n-fi,
+ libreoffice-l10n-fr,
+ libreoffice-l10n-ga,
+ libreoffice-l10n-he,
+ libreoffice-l10n-hi,
+ libreoffice-l10n-hr,
+ libreoffice-l10n-hu,
+ libreoffice-l10n-in,
+ libreoffice-l10n-it,
+ libreoffice-l10n-ka,
+ libreoffice-l10n-km,
+ libreoffice-l10n-ko,
+ libreoffice-l10n-ku,
+ libreoffice-l10n-lt,
+ libreoffice-l10n-lv,
+ libreoffice-l10n-mk,
+ libreoffice-l10n-ne,
+ libreoffice-l10n-nr,
+ libreoffice-l10n-pa-in,
+ libreoffice-l10n-pl,
+ libreoffice-l10n-pt,
+ libreoffice-l10n-ru,
+ libreoffice-l10n-rw,
+ libreoffice-l10n-sk,
+ libreoffice-l10n-sl,
+ libreoffice-l10n-ss,
+ libreoffice-l10n-st,
+ libreoffice-l10n-tg,
+ libreoffice-l10n-th,
+ libreoffice-l10n-tn,
+ libreoffice-l10n-tr,
+ libreoffice-l10n-ts,
+ libreoffice-l10n-uk,
+ libreoffice-l10n-ve,
+ libreoffice-l10n-vi,
+ libreoffice-l10n-xh,
+ libreoffice-l10n-za,
+ libreoffice-l10n-zh-cn,
+ libreoffice-l10n-zu,
 
 Recommends:
  firefox-esr,
-             firefox-esr-l10n-de,
-             firefox-esr-l10n-el,
-             firefox-esr-l10n-it,
-             firefox-esr-l10n-fr,
-             firefox-esr-l10n-es-es,
-             firefox-esr-l10n-eu,
-             firefox-esr-l10n-en-gb,
-             firefox-esr-l10n-es-ar,
-             firefox-esr-l10n-sv-se,
-             firefox-esr-l10n-pt-br
+ firefox-esr-l10n-de,
+ firefox-esr-l10n-el,
+ firefox-esr-l10n-it,
+ firefox-esr-l10n-fr,
+ firefox-esr-l10n-es-es,
+ firefox-esr-l10n-eu,
+ firefox-esr-l10n-en-gb,
+ firefox-esr-l10n-es-ar,
+ firefox-esr-l10n-sv-se,
+ firefox-esr-l10n-pt-br,
 Suggests:
  firefox-esr-l10n-af,
-             firefox-esr-l10n-ar,
-             firefox-esr-l10n-be,
-             firefox-esr-l10n-bg,
-             firefox-esr-l10n-ca,
-             firefox-esr-l10n-cs,
-             firefox-esr-l10n-fi,
-             firefox-esr-l10n-fy-nl,
-             firefox-esr-l10n-ga-ie,
-             firefox-esr-l10n-gu-in,
-             firefox-esr-l10n-he,
-             firefox-esr-l10n-hu,
-             firefox-esr-l10n-ko,
-             firefox-esr-l10n-lt,
-             firefox-esr-l10n-mk,
-             firefox-esr-l10n-nl,
-             firefox-esr-l10n-pa-in,
-             firefox-esr-l10n-pl,
-             firefox-esr-l10n-pt-pt,
-             firefox-esr-l10n-ro,
-             firefox-esr-l10n-ru,
-             firefox-esr-l10n-sk,
-             firefox-esr-l10n-sl,
-             firefox-esr-l10n-tr,
-             firefox-esr-l10n-zh-cn,
-             firefox-esr-l10n-zh-tw
-             and suggest the rests.
-NeedConfig:  yes, Cache, Printerapp, proxy server
+ firefox-esr-l10n-ar,
+ firefox-esr-l10n-be,
+ firefox-esr-l10n-bg,
+ firefox-esr-l10n-ca,
+ firefox-esr-l10n-cs,
+ firefox-esr-l10n-fi,
+ firefox-esr-l10n-fy-nl,
+ firefox-esr-l10n-ga-ie,
+ firefox-esr-l10n-gu-in,
+ firefox-esr-l10n-he,
+ firefox-esr-l10n-hu,
+ firefox-esr-l10n-ko,
+ firefox-esr-l10n-lt,
+ firefox-esr-l10n-mk,
+ firefox-esr-l10n-nl,
+ firefox-esr-l10n-pa-in,
+ firefox-esr-l10n-pl,
+ firefox-esr-l10n-pt-pt,
+ firefox-esr-l10n-ro,
+ firefox-esr-l10n-ru,
+ firefox-esr-l10n-sk,
+ firefox-esr-l10n-sl,
+ firefox-esr-l10n-tr,
+ firefox-esr-l10n-zh-cn,
+ firefox-esr-l10n-zh-tw,
+NeedConfig: yes, Cache, Printerapp, proxy server
 
 Recommends:
- chromium
-NeedConfig:  yes - set system wide proxy settings
+ chromium,
+NeedConfig: yes - set system wide proxy settings
 
 Depends:
- gecko-mediaplayer | mozilla-plugin-vlc
-             firefox plugin for this.
+ gecko-mediaplayer | mozilla-plugin-vlc,
 
 Recommends:
- djview-plugin
+ djview-plugin,
 
 Recommends:
  thunderbird,
-             thunderbird-l10n-ca,
-             thunderbird-l10n-de,
-             thunderbird-l10n-el,
-             thunderbird-l10n-es-es,
-             thunderbird-l10n-fr,
-             thunderbird-l10n-it
-NeedConfig:  yes - Cache, Printerapp, proxy server
+ thunderbird-l10n-ca,
+ thunderbird-l10n-de,
+ thunderbird-l10n-el,
+ thunderbird-l10n-es-es,
+ thunderbird-l10n-fr,
+ thunderbird-l10n-it,
+NeedConfig: yes - Cache, Printerapp, proxy server
 
 Depends:
- konqueror-plugin-gnash, browser-plugin-gnash | mozilla-plugin-gnash
+ konqueror-plugin-gnash,
+ browser-plugin-gnash | mozilla-plugin-gnash,
 Suggests:
- flashplugin-nonfree
+ flashplugin-nonfree,
 Ignore:
- browser-plugin-lightspark
+ browser-plugin-lightspark,
 Avoid:
- flashplugin-nonfree
+ flashplugin-nonfree,
 
 Recommends:
- default-jre, icedtea-8-plugin
+ default-jre,
+ icedtea-8-plugin,
 
 Depends:
- debian-edu-artwork, plymouth, plymouth-themes
-NeedConfig:  yes - kdm and kde need to be configured to use it.
+ debian-edu-artwork,
+ plymouth,
+ plymouth-themes,
+NeedConfig: yes - kdm and kde need to be configured to use it.
 
 Depends:
- gnupg2 | gnupg, gnupg-agent
+ gnupg2 | gnupg,
+ gnupg-agent,
 Suggests:
- gnupg-doc
+ gnupg-doc,
 Avoid:
- pgp
+ pgp,
 
 Depends:
- avahi-daemon, libnss-mdns
+ avahi-daemon,
+ libnss-mdns,
 Suggests:
- avahi-discover, mdns-scan, avahi-autoipd
+ avahi-discover,
+ mdns-scan,
+ avahi-autoipd,
 
 Depends:
- cups-client, cups-bsd
+ cups-client,
+ cups-bsd,
 
 Depends:
- unzip, zip, bzip2
+ unzip,
+ zip,
+ bzip2,
 
 Ignore:
- ifplugd
-NeedConfig:  yes - the if listed in /etc/default/ifplugd must not has auto eth(?) in interface
+ ifplugd,
+NeedConfig: yes - the if listed in /etc/default/ifplugd must not has auto eth(?) in interface
 
 Depends:
- isc-dhcp-client | dhcp3-client
+ isc-dhcp-client | dhcp3-client,
 Avoid:
- pump
+ pump,
 
 Depends:
  freerdp-x11 | rdesktop
-             have a Linux Desktop
 
 Depends:
- ktuberling
+ ktuberling,
 
 Depends:
- openshot, kdenlive, stopmotion
+ openshot,
+ kdenlive,
+ stopmotion,
 Recommends:
- vgrabbj, dvgrab, libav-tools
+ vgrabbj,
+ dvgrab,
+ libav-tools,
 Suggests:
- kino, pitivi, xine-ui, libdvdcss2, openmovieeditor
+ kino,
+ pitivi,
+ xine-ui,
+ libdvdcss2,
+ openmovieeditor,
 
 Ignore:
- clamav, clamav-docs, clamav-freshclam, clamav-data
+ clamav,
+ clamav-docs,
+ clamav-freshclam,
+ clamav-data,
 
 Depends:
- gcompris
+ gcompris,
 Recommends:
- gnuchess, gnucap, tuxpaint, tuxpaint-config
-Suggests:
- gcompris-sound-de, gcompris-sound-en,
-             gcompris-sound-es, gcompris-sound-eu, gcompris-sound-fi,
-             gcompris-sound-fr, gcompris-sound-hu, gcompris-sound-it,
-             gcompris-sound-nl, gcompris-sound-pt, gcompris-sound-ru,
-             gcompris-sound-sv, gcompris-sound-cs, gcompris-sound-mr,
-             gcompris-sound-ptbr, gcompris-sound-so, gcompris-sound-tr
+ gnuchess,
+ gnucap,
+ tuxpaint,
+ tuxpaint-config,
+Suggests:
+ gcompris-sound-de,
+ gcompris-sound-en,
+ gcompris-sound-es,
+ gcompris-sound-eu,
+ gcompris-sound-fi,
+ gcompris-sound-fr,
+ gcompris-sound-hu,
+ gcompris-sound-it,
+ gcompris-sound-nl,
+ gcompris-sound-pt,
+ gcompris-sound-ru,
+ gcompris-sound-sv,
+ gcompris-sound-cs,
+ gcompris-sound-mr,
+ gcompris-sound-ptbr,
+ gcompris-sound-so,
+ gcompris-sound-tr,
 Ignore:
- gcompris-sound-ar, gcompris-sound-bg, gcompris-sound-br,
-             gcompris-sound-cs, gcompris-sound-el, gcompris-sound-hi,
-             gcompris-sound-id, gcompris-sound-mr, gcompris-sound-so,
-             gcompris-sound-sr, gcompris-sound-ur
+ gcompris-sound-ar,
+ gcompris-sound-bg,
+ gcompris-sound-br,
+ gcompris-sound-cs,
+ gcompris-sound-el,
+ gcompris-sound-hi,
+ gcompris-sound-id,
+ gcompris-sound-mr,
+ gcompris-sound-so,
+ gcompris-sound-sr,
+ gcompris-sound-ur,
 
 Suggests:
- smbclient
+ smbclient,
 
 Suggests:
- ncftp, wget
+ ncftp,
+ wget,
 
 Suggests:
- pgdesigner
+ pgdesigner,
 
 Suggests:
- kig
+ kig,
 
 Suggests:
- postgresql-client, postgresql
+ postgresql-client,
+ postgresql,
 
 Suggests:
- sql-ledger
+ sql-ledger,
 
 Recommends:
- planner
+ planner,
 
 Suggests:
- gnuplot
+ gnuplot,
 
 Suggests:
- texlive, texlive-doc-base, lacheck, auctex, texlive-latex-base
+ texlive,
+ texlive-doc-base,
+ lacheck,
+ auctex,
+ texlive-latex-base,
 Ignore:
- texlive-full
+ texlive-full,
 
 Suggests:
  lyx,
-             texmacs
+ texmacs,
 
 Depends:
- inkscape
+ inkscape,
 Recommends:
- gimp, gimp-data-extras, gimp-ufraw
+ gimp,
+ gimp-data-extras,
+ gimp-ufraw,
 Suggests:
- netpbm, gv, dia
+ netpbm,
+ gv,
+ dia,
 Ignore:
- gimp-help-de, gimp-help-en, gimp-help-fr,
-             gimp-help-it, gimp-help-nl, gimp-help-sv
+ gimp-help-de,
+ gimp-help-en,
+ gimp-help-fr,
+ gimp-help-it,
+ gimp-help-nl,
+ gimp-help-sv,
 
 Recommends:
- cheese
+ cheese,
 
 Recommends:
- sane, sane-utils, skanlite, ocrad
-NeedConfig:  yes
+ sane,
+ sane-utils,
+ skanlite,
+ ocrad,
+NeedConfig: yes
 
 Recommends:
  hunspell-en-gb,
-             hunspell-de-de,
-             myspell-fr,
-             myspell-es,
-             hunspell-it,
-             myspell-el-gr,
-             myspell-pt-br,
-             hunspell-ca,
-             myspell-nl,
-             myspell-pt-pt,
-             tmispell-voikko
+ hunspell-de-de,
+ myspell-fr,
+ myspell-es,
+ hunspell-it,
+ myspell-el-gr,
+ myspell-pt-br,
+ hunspell-ca,
+ myspell-nl,
+ myspell-pt-pt,
+ tmispell-voikko,
 Suggests:
- hunspell-de-at, hunspell-de-ch, myspell-fr-gut
+ hunspell-de-at,
+ hunspell-de-ch,
+ myspell-fr-gut,
 
 Suggests:
- lightspeed
+ lightspeed,
 
 Recommends:
- k3b | brasero, k3b-i18n | brasero
-NeedConfig:  yes - access to the cdrom group, and kernel module loading via pam_groups.so
+ k3b | brasero,
+ k3b-i18n | brasero,
+NeedConfig: yes - access to the cdrom group, and kernel module loading via pam_groups.so
 
 Suggests:
- kppp
+ kppp,
 
 Suggests:
- pppoeconf
+ pppoeconf,
 
 Suggests:
- kuser
+ kuser,
 
 Ignore:
- f-spot
+ f-spot,
 
 Recommends:
- tuxmath
+ tuxmath,
 
 Ignore:
- ttf-mscorefonts-installer
+ ttf-mscorefonts-installer,
 
 Ignore:
- nvidia-settings, dosemu,
-             kmessedwords, gs,
+ nvidia-settings,
+ dosemu,
+ kmessedwords,
+ gs,
 
 Suggests:
- tablix2, gtablix, fet
+ tablix2,
+ gtablix,
+ fet,
 
 Ignore:
- qemu, qemu-launcher, qemuctl
+ qemu,
+ qemu-launcher,
+ qemuctl,
 
 Suggests:
- monopd
+ monopd,
 
 Suggests:
- fonts-arphic-uming, im-switch, scim-chewing, scim-tables-zh
+ fonts-arphic-uming,
+ im-switch,
+ scim-chewing,
+ scim-tables-zh,
 
 Ignore:
- fonts-dzongkha
+ fonts-dzongkha,
 
 Suggests:
  rsibreak | workrave
 
 Suggests:
- kpat, kbattleship,
-             kbounce, kspaceduel,
-             kgoldrunner, kolf, kmines, konquest, kshisen,
-             katomic, klickety, kblackbox, kjumpingcube,
-             kmahjongg, kreversi
+ kpat,
+ kbattleship,
+ kbounce,
+ kspaceduel,
+ kgoldrunner,
+ kolf,
+ kmines,
+ konquest,
+ kshisen,
+ katomic,
+ klickety,
+ kblackbox,
+ kjumpingcube,
+ kmahjongg,
+ kreversi,
 Ignore:
- kdegames
+ kdegames,
 
 Recommends:
- education-astronomy, education-chemistry,
-             education-electronics, education-geography,
-             education-graphics, education-language,
-             education-logic-games, education-mathematics,
-             education-music, education-physics, education-misc
+ education-astronomy,
+ education-chemistry,
+ education-electronics,
+ education-geography,
+ education-graphics,
+ education-language,
+ education-logic-games,
+ education-mathematics,
+ education-music,
+ education-physics,
+ education-misc,
 
 Suggests:
- wine
+ wine,
 
 Suggests:
- gettext
+ gettext,
 
 Suggests:
- kernel-package, libncurses5-dev
+ kernel-package,
+ libncurses5-dev,
 
 Ignore:
- mgp
+ mgp,
 
 Ignore:
- gtkwhiteboard, bluetooth, xournal, wmgui, wminput
+ gtkwhiteboard,
+ bluetooth,
+ xournal,
+ wmgui,
+ wminput,
 
 Ignore:
- kde-l10n-ar, kde-l10n-bg,
-             kde-l10n-bs, kde-l10n-ca,
-             kde-l10n-cs, kde-l10n-da, kde-l10n-de,
-             kde-l10n-el, kde-l10n-engb, kde-l10n-eo, kde-l10n-es,
-             kde-l10n-et, kde-l10n-eu, kde-l10n-fa, kde-l10n-fi,
-             kde-l10n-fr, kde-l10n-ga, kde-l10n-gl,
-             kde-l10n-he, kde-l10n-hi, kde-l10n-hr, kde-l10n-hu,
-             kde-l10n-is, kde-l10n-it, kde-l10n-km,
-             kde-l10n-ko, kde-l10n-lt, kde-l10n-lv, kde-l10n-mk,
-             kde-l10n-nb, kde-l10n-nds,
-             kde-l10n-nl, kde-l10n-nn, kde-l10n-pa, kde-l10n-pl,
-             kde-l10n-pt, kde-l10n-ro, kde-l10n-ru,
-             kde-l10n-se, kde-l10n-sk, kde-l10n-sl,
-             kde-l10n-sr,
-             kde-l10n-tr, kde-l10n-uk,
-             kde-l10n-zhcn, kde-l10n-zhtw
-
-Suggests:
- controlaula
-NeedConfig:  yes
+ kde-l10n-ar,
+ kde-l10n-bg,
+ kde-l10n-bs,
+ kde-l10n-ca,
+ kde-l10n-cs,
+ kde-l10n-da,
+ kde-l10n-de,
+ kde-l10n-el,
+ kde-l10n-engb,
+ kde-l10n-eo,
+ kde-l10n-es,
+ kde-l10n-et,
+ kde-l10n-eu,
+ kde-l10n-fa,
+ kde-l10n-fi,
+ kde-l10n-fr,
+ kde-l10n-ga,
+ kde-l10n-gl,
+ kde-l10n-he,
+ kde-l10n-hi,
+ kde-l10n-hr,
+ kde-l10n-hu,
+ kde-l10n-is,
+ kde-l10n-it,
+ kde-l10n-km,
+ kde-l10n-ko,
+ kde-l10n-lt,
+ kde-l10n-lv,
+ kde-l10n-mk,
+ kde-l10n-nb,
+ kde-l10n-nds,
+ kde-l10n-nl,
+ kde-l10n-nn,
+ kde-l10n-pa,
+ kde-l10n-pl,
+ kde-l10n-pt,
+ kde-l10n-ro,
+ kde-l10n-ru,
+ kde-l10n-se,
+ kde-l10n-sk,
+ kde-l10n-sl,
+ kde-l10n-sr,
+ kde-l10n-tr,
+ kde-l10n-uk,
+ kde-l10n-zhcn,
+ kde-l10n-zhtw,
+
+Suggests:
+ controlaula,
+NeedConfig: yes
 
 Recommends:
- gtk-recordmydesktop
+ gtk-recordmydesktop,
 
 Recommends:
- pavucontrol
+ pavucontrol,
 
 Recommends:
- goplay
+ goplay,
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index 5d13125..688394c 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -8,18 +8,20 @@ Description: Debian Edu Xfce desktop applications
  for teachers and their students.
 
 Depends:
- education-common
+ education-common,
 
 Depends:
- xfce4, xfce4-goodies
+ xfce4,
+ xfce4-goodies,
 
 Depends:
- lightdm | x-display-manager
+ lightdm | x-display-manager,
 Recommends:
- system-config-printer, tango-icon-theme
+ system-config-printer,
+ tango-icon-theme,
 
 Recommends:
- blueman
+ blueman,
 
 Recommends:
- ssh-askpass
+ ssh-askpass,
diff --git a/tasks/development b/tasks/development
index 654ae04..e479135 100644
--- a/tasks/development
+++ b/tasks/development
@@ -9,57 +9,76 @@ Description: Debian Edu software development related educational applications
  results for beginners.
 
 Recommends:
- education-menus
+ education-menus,
 
 Depends:
- fp-compiler, fp-ide, fp-units-base, fp-units-gfx, fp-utils, fp-units-gtk2,
-         fp-docs, fpc-source, fp-units-fcl, fp-units-i386, fp-units-multimedia,
-         fp-units-misc, fp-units-net, fp-units-rtl, fp-units-fv
+ fp-compiler,
+ fp-ide,
+ fp-units-base,
+ fp-units-gfx,
+ fp-utils,
+ fp-units-gtk2,
+ fp-docs,
+ fpc-source,
+ fp-units-fcl,
+ fp-units-i386,
+ fp-units-multimedia,
+ fp-units-misc,
+ fp-units-net,
+ fp-units-rtl,
+ fp-units-fv,
 
 Depends:
- lazarus
+ lazarus,
 
 Depends:
- gambas2
+ gambas2,
 
 Suggests:
- eclipse
+ eclipse,
 Remark: Eclipse is a really powerful development environment and schould not be
  missing in this list, but it might be some overkill for students and thus it
  is only "Suggested".
 
 Depends:
- bwbasic
+ bwbasic,
 
 Depends:
- kturtle
+ kturtle,
 
 Depends:
- kommander
+ kommander,
 
 Suggests:
- tk8.5-dev, tcl8.5-dev
+ tk8.5-dev,
+ tcl8.5-dev,
 
 Suggests:
- swi-prolog, swi-prolog-doc
+ swi-prolog,
+ swi-prolog-doc,
 
 Depends:
- squeak-vm
+ squeak-vm,
 
 Depends:
- python
+ python,
 Recommends:
- drpython, gvrng, python-easygui
+ drpython,
+ gvrng,
+ python-easygui,
 
 Depends:
- umbrello
+ umbrello,
 
 Recommends:
- bluefish
+ bluefish,
 
 Depends:
- kdevelop
+ kdevelop,
 
 Depends:
- build-essential, autoconf, subversion, ddd
+ build-essential,
+ autoconf,
+ subversion,
+ ddd,
 
diff --git a/tasks/electronics b/tasks/electronics
index 7d561df..32f3620 100644
--- a/tasks/electronics
+++ b/tasks/electronics
@@ -7,12 +7,23 @@ Description: Debian Edu electronics related applications
  teach electronics.
 
 Depends:
- qucs, gpsim, oregano
+ qucs,
+ gpsim,
+ oregano,
 Recommends:
- education-menus, xoscope
+ education-menus,
+ xoscope,
 Suggests:
- kicad, kicad-doc-en, kicad-doc-de, kicad-doc-es, kicad-doc-fr,
-          electric, pcb, xcircuit, freehdl, gtkwave
+ kicad,
+ kicad-doc-en,
+ kicad-doc-de,
+ kicad-doc-es,
+ kicad-doc-fr,
+ electric,
+ pcb,
+ xcircuit,
+ freehdl,
+ gtkwave,
 
 Depends:
- ktechlab
+ ktechlab,
diff --git a/tasks/geography b/tasks/geography
index 3c46727..c624b96 100644
--- a/tasks/geography
+++ b/tasks/geography
@@ -7,17 +7,37 @@ Description: Debian Edu applications for geography
  to teach geography.
 
 Depends:
- kgeography, marble
+ kgeography,
+ marble,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- gpscorrelate, qlandkartegt, viking, googleearth-package,
-          mapserver-bin, openscenegraph, grass, qgis, gmt,
-          thuban, earth3d
+ gpscorrelate,
+ qlandkartegt,
+ viking,
+ googleearth-package,
+ mapserver-bin,
+ openscenegraph,
+ grass,
+ qgis,
+ gmt,
+ thuban,
+ earth3d,
 Ignore:
- drawmap, gdal-bin, libgeo-coordinates-utm-perl,
-          libgeo-helmerttransform-perl, libgeo-metar-perl,
-          libgeo-postcode-perl, libgeos-c1, ogdi-bin,
-          qgis-plugin-grass, postgis, proj,
-          gpsbabel, libogdi3.2, libterralib1c2a,
-          r-cran-mapdata, r-cran-maps, worldwind
+ drawmap,
+ gdal-bin,
+ libgeo-coordinates-utm-perl,
+ libgeo-helmerttransform-perl,
+ libgeo-metar-perl,
+ libgeo-postcode-perl,
+ libgeos-c1,
+ ogdi-bin,
+ qgis-plugin-grass,
+ postgis,
+ proj,
+ gpsbabel,
+ libogdi3.2,
+ libterralib1c2a,
+ r-cran-mapdata,
+ r-cran-maps,
+ worldwind,
diff --git a/tasks/graphics b/tasks/graphics
index 157da92..4ea4bf2 100644
--- a/tasks/graphics
+++ b/tasks/graphics
@@ -7,13 +7,21 @@ Description: Debian Edu graphics related applications
  teach graphics and pictural art.
 
 Depends:
- inkscape, gimp, librecad, dia
+ inkscape,
+ gimp,
+ librecad,
+ dia,
 Recommends:
- education-menus, xpaint
+ education-menus,
+ xpaint,
 Suggests:
- xfig, xaos, tgif, hugin, blender
+ xfig,
+ xaos,
+ tgif,
+ hugin,
+ blender,
 Ignore:
- dcraw
+ dcraw,
 
 Depends:
- scribus
+ scribus,
diff --git a/tasks/lang-da b/tasks/lang-da
index 367eca2..eaa77ec 100644
--- a/tasks/lang-da
+++ b/tasks/lang-da
@@ -7,7 +7,7 @@ Description: Debian Edu applications for Danish installs
  language is selected during installation.
 
 Recommends:
- myspell-da
+ myspell-da,
 
 Depends:
- debian-edu-doc-da
+ debian-edu-doc-da,
diff --git a/tasks/lang-da-desktop b/tasks/lang-da-desktop
index b2b79dc..e22a8b3 100644
--- a/tasks/lang-da-desktop
+++ b/tasks/lang-da-desktop
@@ -1,20 +1,21 @@
 Task: Danish Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-da
+Enhances: education-desktop-other,
+ education-lang-da,
 Description: Debian Edu Desktop applications for Danish installs
  This subtask depends on various office and desktop applications to
  install when the Danish language is selected during installation.
 
 Depends:
- gcompris-sound-da
+ gcompris-sound-da,
 
 Recommends:
  libreoffice-help-da,
-             libreoffice-l10n-da
+ libreoffice-l10n-da,
 
 Recommends:
- firefox-esr-l10n-da
+ firefox-esr-l10n-da,
 
 Suggests:
- thunderbird-l10n-da
+ thunderbird-l10n-da,
diff --git a/tasks/lang-da-desktop-kde b/tasks/lang-da-desktop-kde
index 792b1be..bc08319 100644
--- a/tasks/lang-da-desktop-kde
+++ b/tasks/lang-da-desktop-kde
@@ -1,9 +1,10 @@
 Task: Danish KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-da
+Enhances: education-desktop-kde,
+ education-lang-da,
 Architecture: any
 Description: Danish Debian Edu KDE desktop applications
  This task localises the KDE desktop in Danish.
 
 Recommends:
- kde-l10n-da
+ kde-l10n-da,
diff --git a/tasks/lang-de b/tasks/lang-de
index 8e2ff75..5f18f92 100644
--- a/tasks/lang-de
+++ b/tasks/lang-de
@@ -7,7 +7,9 @@ Description: Debian Edu applications for German installs
  language is selected during installation.
 
 Recommends:
- hunspell-de-at, hunspell-de-ch, hunspell-de-de
+ hunspell-de-at,
+ hunspell-de-ch,
+ hunspell-de-de,
 
 Depends:
- debian-edu-doc-de
+ debian-edu-doc-de,
diff --git a/tasks/lang-de-desktop b/tasks/lang-de-desktop
index 6d876ce..7253e7c 100644
--- a/tasks/lang-de-desktop
+++ b/tasks/lang-de-desktop
@@ -1,26 +1,28 @@
 Task: German Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-de
+Enhances: education-desktop-other,
+ education-lang-de,
 Description: Debian Edu Desktop applications for German installs
  This subtask depends on various office and desktop applications
  that are useful for teachers and their students.
 
 Recommends:
- gcompris-sound-de
+ gcompris-sound-de,
 
 Recommends:
- gimp-help-de
+ gimp-help-de,
 
 Recommends:
  libreoffice-help-de,
-             hyphen-de,
-             libreoffice-l10n-de,
-             mythes-de, mythes-de-ch
+ hyphen-de,
+ libreoffice-l10n-de,
+ mythes-de,
+ mythes-de-ch,
 
 Recommends:
- firefox-esr-l10n-de
+ firefox-esr-l10n-de,
 
 Suggests:
- thunderbird-l10n-de
+ thunderbird-l10n-de,
 
diff --git a/tasks/lang-de-desktop-kde b/tasks/lang-de-desktop-kde
index 64a8d99..0c637e2 100644
--- a/tasks/lang-de-desktop-kde
+++ b/tasks/lang-de-desktop-kde
@@ -1,9 +1,10 @@
 Task: German KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-de
+Enhances: education-desktop-kde,
+ education-lang-de,
 Architecture: any
 Description: German Debian Edu KDE desktop applications
  This task localises the KDE desktop in German.
 
 Recommends:
- kde-l10n-de
+ kde-l10n-de,
diff --git a/tasks/lang-es b/tasks/lang-es
index 06aeefe..b559d71 100644
--- a/tasks/lang-es
+++ b/tasks/lang-es
@@ -8,7 +8,7 @@ Description: Debian Edu applications for Spanish installs
 
 Recommends:
  myspell-es,
-             manpages-es-extra
+ manpages-es-extra,
 
 Depends:
- debian-edu-doc-es
+ debian-edu-doc-es,
diff --git a/tasks/lang-es-desktop b/tasks/lang-es-desktop
index d1a4814..dcdcdf7 100644
--- a/tasks/lang-es-desktop
+++ b/tasks/lang-es-desktop
@@ -1,23 +1,24 @@
 Task: Spanish Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-es
+Enhances: education-desktop-other,
+ education-lang-es,
 Description: Debian Edu Desktop applications for Spanish installs
  This subtask depends on various office and desktop applications to
  install when the Spanish language is selected during installation.
 
 Depends:
- gcompris-sound-es
+ gcompris-sound-es,
 
 Recommends:
- gimp-help-es
+ gimp-help-es,
 
 Recommends:
  libreoffice-help-es,
-             libreoffice-l10n-es
+ libreoffice-l10n-es,
 
 Recommends:
- firefox-esr-l10n-es-es
+ firefox-esr-l10n-es-es,
 
 Suggests:
- thunderbird-l10n-es-es
+ thunderbird-l10n-es-es,
diff --git a/tasks/lang-es-desktop-kde b/tasks/lang-es-desktop-kde
index 8744eda..9c52ffc 100644
--- a/tasks/lang-es-desktop-kde
+++ b/tasks/lang-es-desktop-kde
@@ -1,9 +1,10 @@
 Task: Spanish KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-es
+Enhances: education-desktop-kde,
+ education-lang-es,
 Architecture: any
 Description: Spanish Debian Edu KDE desktop applications
  This task localises the KDE desktop in Spanish.
 
 Recommends:
- kde-l10n-es
+ kde-l10n-es,
diff --git a/tasks/lang-fr b/tasks/lang-fr
index b523d84..15a2a63 100644
--- a/tasks/lang-fr
+++ b/tasks/lang-fr
@@ -8,7 +8,7 @@ Description: Debian Edu applications for French installs
 
 Recommends:
  myspell-fr,
-             manpages-fr-extra
+ manpages-fr-extra,
 
 Depends:
- debian-edu-doc-fr
+ debian-edu-doc-fr,
diff --git a/tasks/lang-fr-desktop b/tasks/lang-fr-desktop
index 1ede484..6410b83 100644
--- a/tasks/lang-fr-desktop
+++ b/tasks/lang-fr-desktop
@@ -1,28 +1,29 @@
 Task: French Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-fr
+Enhances: education-desktop-other,
+ education-lang-fr,
 Description: Debian Edu Desktop applications for French installs
  This subtask depends on various office and desktop applications
  that are useful for teachers and their students.
 
 Recommends:
- gcompris-sound-fr
+ gcompris-sound-fr,
 
 Recommends:
- gimp-help-fr
+ gimp-help-fr,
 
 Recommends:
  libreoffice-help-fr,
-             hyphen-fr,
-             libreoffice-l10n-fr,
-             mythes-fr
+ hyphen-fr,
+ libreoffice-l10n-fr,
+ mythes-fr,
 
 Recommends:
- firefox-esr-l10n-fr
+ firefox-esr-l10n-fr,
 
 Suggests:
- thunderbird-l10n-fr
+ thunderbird-l10n-fr,
 
 Suggests:
- aptitude-doc-fr
+ aptitude-doc-fr,
diff --git a/tasks/lang-fr-desktop-kde b/tasks/lang-fr-desktop-kde
index 3aef3a9..cb9733b 100644
--- a/tasks/lang-fr-desktop-kde
+++ b/tasks/lang-fr-desktop-kde
@@ -1,9 +1,10 @@
 Task: French KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-fr
+Enhances: education-desktop-kde,
+ education-lang-fr,
 Architecture: any
 Description: French Debian Edu KDE desktop applications
  This task localises the KDE desktop in French.
 
 Recommends:
- kde-l10n-fr
+ kde-l10n-fr,
diff --git a/tasks/lang-he b/tasks/lang-he
index dde4401..2d04ee2 100644
--- a/tasks/lang-he
+++ b/tasks/lang-he
@@ -7,4 +7,6 @@ Description: Debian Edu applications for Hebrew installs
  that are useful for teachers and their students.
 
 Recommends:
- aspell-he, hspell, myspell-he
+ aspell-he,
+ hspell,
+ myspell-he,
diff --git a/tasks/lang-he-desktop b/tasks/lang-he-desktop
index fced8be..7334137 100644
--- a/tasks/lang-he-desktop
+++ b/tasks/lang-he-desktop
@@ -1,20 +1,22 @@
 Task: Hebrew Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-he
+Enhances: education-desktop-other,
+ education-lang-he,
 Description: Debian Edu Desktop applications for Hebrew installs
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
 Recommends:
- libfribidi0, culmus
+ libfribidi0,
+ culmus,
 
 Recommends:
- libreoffice-l10n-he
+ libreoffice-l10n-he,
 
 Recommends:
- firefox-esr-l10n-he
+ firefox-esr-l10n-he,
 
 Suggests:
- thunderbird-l10n-he
+ thunderbird-l10n-he,
 
diff --git a/tasks/lang-he-desktop-kde b/tasks/lang-he-desktop-kde
index 500acdf..8c3abce 100644
--- a/tasks/lang-he-desktop-kde
+++ b/tasks/lang-he-desktop-kde
@@ -1,9 +1,10 @@
 Task: Hebrew KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-he
+Enhances: education-desktop-kde,
+ education-lang-he,
 Architecture: any
 Description: Hebrew Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Hebrew.
 
 Recommends:
- kde-l10n-he
+ kde-l10n-he,
diff --git a/tasks/lang-it b/tasks/lang-it
index c2fd869..c421bb7 100644
--- a/tasks/lang-it
+++ b/tasks/lang-it
@@ -7,7 +7,7 @@ Description: Debian Edu applications for Italian installs
  language is selected during installation.
 
 Recommends:
- hunspell-it
+ hunspell-it,
 
 Depends:
- debian-edu-doc-it
+ debian-edu-doc-it,
diff --git a/tasks/lang-it-desktop b/tasks/lang-it-desktop
index ccec43f..91cd522 100644
--- a/tasks/lang-it-desktop
+++ b/tasks/lang-it-desktop
@@ -1,21 +1,22 @@
 Task: Italian Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-es
+Enhances: education-desktop-other,
+ education-lang-es,
 Description: Debian Edu Desktop applications for Italian installs
  This subtask depends on various office and desktop applications to
  install when the Italian language is selected during installation.
 
 Depends:
- gcompris-sound-it
+ gcompris-sound-it,
 
 Recommends:
- gimp-help-it
+ gimp-help-it,
 
 Recommends:
  libreoffice-help-it,
-             libreoffice-l10n-it,
-             mythes-it
+ libreoffice-l10n-it,
+ mythes-it,
 
 Recommends:
- firefox-esr-l10n-it
+ firefox-esr-l10n-it,
diff --git a/tasks/lang-it-desktop-kde b/tasks/lang-it-desktop-kde
index df83f7c..b80f3a4 100644
--- a/tasks/lang-it-desktop-kde
+++ b/tasks/lang-it-desktop-kde
@@ -1,9 +1,10 @@
 Task: Italian KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-it
+Enhances: education-desktop-kde,
+ education-lang-it,
 Architecture: any
 Description: Italian Debian Edu KDE desktop applications
  This task localises the KDE desktop in Italian.
 
 Recommends:
- kde-l10n-it
+ kde-l10n-it,
diff --git a/tasks/lang-ja b/tasks/lang-ja
index dc034b8..12e8903 100644
--- a/tasks/lang-ja
+++ b/tasks/lang-ja
@@ -7,4 +7,4 @@ Description: Debian Edu applications for Japanese installs
  that are useful for teachers and their students.
 
 Depends:
- debian-edu-doc-ja
+ debian-edu-doc-ja,
diff --git a/tasks/lang-ja-desktop b/tasks/lang-ja-desktop
index 884eb0a..5c05253 100644
--- a/tasks/lang-ja-desktop
+++ b/tasks/lang-ja-desktop
@@ -1,25 +1,27 @@
 Task: Japanese Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-ja
+Enhances: education-desktop-other,
+ education-lang-ja,
 Description: Debian Edu Desktop applications for Japanese installs
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
 Recommends:
- fonts-vlgothic, ibus-anthy
+ fonts-vlgothic,
+ ibus-anthy,
 Avoid:
- cmap-adobe-japan1
+ cmap-adobe-japan1,
 
 Recommends:
  libreoffice-l10n-ja,
-             libreoffice-help-ja
+ libreoffice-help-ja,
 
 Recommends:
- firefox-esr-l10n-ja
+ firefox-esr-l10n-ja,
 
 Suggests:
- thunderbird-l10n-ja
+ thunderbird-l10n-ja,
 
 Suggests:
- aptitude-doc-ja
+ aptitude-doc-ja,
diff --git a/tasks/lang-ja-desktop-kde b/tasks/lang-ja-desktop-kde
index f155ee3..de050eb 100644
--- a/tasks/lang-ja-desktop-kde
+++ b/tasks/lang-ja-desktop-kde
@@ -1,9 +1,10 @@
 Task: Japenese KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-ja
+Enhances: education-desktop-kde,
+ education-lang-ja,
 Architecture: any
 Description: Japanese Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Japanese.
 
 Recommends:
- kde-l10n-ja
+ kde-l10n-ja,
diff --git a/tasks/lang-no b/tasks/lang-no
index 3a1c0b0..c80e2e4 100644
--- a/tasks/lang-no
+++ b/tasks/lang-no
@@ -7,8 +7,9 @@ Description: Debian Edu applications for Norwegian installs
  languages are selected during installation.
 
 Recommends:
- myspell-nb, aspell-no,
-             myspell-nn
+ myspell-nb,
+ aspell-no,
+ myspell-nn,
 
 Depends:
- debian-edu-doc-nb
+ debian-edu-doc-nb,
diff --git a/tasks/lang-no-desktop b/tasks/lang-no-desktop
index 16153ea..48dd3eb 100644
--- a/tasks/lang-no-desktop
+++ b/tasks/lang-no-desktop
@@ -1,25 +1,27 @@
 Task: Norwegian Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-no
+Enhances: education-desktop-other,
+ education-lang-no,
 Description: Debian Edu Desktop applications for Norwegian installs
  This subtask depends on various office and desktop applications to
  install when Norwegian languages are selected during installation.
 
 Recommends:
- gcompris-sound-nb
+ gcompris-sound-nb,
 
 Recommends:
- gimp-help-nn
+ gimp-help-nn,
 
 Recommends:
  libreoffice-l10n-nb,
-             libreoffice-l10n-nn
+ libreoffice-l10n-nn,
 
 Recommends:
  firefox-esr-l10n-nb-no,
-             firefox-esr-l10n-nn-no
+ firefox-esr-l10n-nn-no,
 
 Suggests:
- thunderbird-l10n-nb-no, thunderbird-l10n-nn-no
+ thunderbird-l10n-nb-no,
+ thunderbird-l10n-nn-no,
 
diff --git a/tasks/lang-no-desktop-kde b/tasks/lang-no-desktop-kde
index 604047c..a0b7691 100644
--- a/tasks/lang-no-desktop-kde
+++ b/tasks/lang-no-desktop-kde
@@ -1,10 +1,11 @@
 Task: Norwegian KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-no
+Enhances: education-desktop-kde,
+ education-lang-no,
 Architecture: any
 Description: Norwegian (Bokmaal and Nynorsk) Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Norwegian.
 
 Recommends:
  kde-l10n-nn,
-             kde-l10n-nb
+ kde-l10n-nb,
diff --git a/tasks/lang-se b/tasks/lang-se
index 8c59e6d..264d6a1 100644
--- a/tasks/lang-se
+++ b/tasks/lang-se
@@ -7,4 +7,4 @@ Description: Debian Edu applications for North Sami installs
  Sami language is selected during installation.
 
 Recommends:
- hunspell-se
+ hunspell-se,
diff --git a/tasks/lang-zh-tw b/tasks/lang-zh-tw
index 7de9db5..b04415d 100644
--- a/tasks/lang-zh-tw
+++ b/tasks/lang-zh-tw
@@ -7,4 +7,4 @@ Description: Debian Edu applications for Traditional Chinese installs
  that are useful for teachers and their students.
 
 Depends:
- fonts-arphic-ukai
+ fonts-arphic-ukai,
diff --git a/tasks/lang-zh-tw-desktop b/tasks/lang-zh-tw-desktop
index 2dd595c..b5ab22c 100644
--- a/tasks/lang-zh-tw-desktop
+++ b/tasks/lang-zh-tw-desktop
@@ -1,15 +1,21 @@
 Task: Traditional Chinese Desktop
 Section: metapackages
 Architecture: any
-Enhances: education-desktop-other, education-lang-zh-tw
+Enhances: education-desktop-other,
+ education-lang-zh-tw,
 Description: Debian Edu Desktop applications for Traditional Chinese installs
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
 Depends:
  libreoffice-help-zh-tw,
-             libreoffice-l10n-zh-tw
+ libreoffice-l10n-zh-tw,
 
 Depends:
- fonts-arphic-uming, fonts-wqy-zenhei, fonts-wqy-microhei,
-             im-switch, ibus-chewing, ibus-table-cangjie, ibus-array
+ fonts-arphic-uming,
+ fonts-wqy-zenhei,
+ fonts-wqy-microhei,
+ im-switch,
+ ibus-chewing,
+ ibus-table-cangjie,
+ ibus-array,
diff --git a/tasks/lang-zh-tw-desktop-kde b/tasks/lang-zh-tw-desktop-kde
index b965f5f..4b75c27 100644
--- a/tasks/lang-zh-tw-desktop-kde
+++ b/tasks/lang-zh-tw-desktop-kde
@@ -1,9 +1,10 @@
 Task: Traditional Chinese KDE Desktop
 Section: metapackages
-Enhances: education-desktop-kde, education-lang-zh-tw
+Enhances: education-desktop-kde,
+ education-lang-zh-tw,
 Architecture: any
 Description: Traditional Chinese Debian Edu KDE desktop applications
  This task localises the KDE desktop in Traditional Chinese.
 
 Recommends:
- kde-l10n-zhtw
+ kde-l10n-zhtw,
diff --git a/tasks/language b/tasks/language
index af996ae..44cf89d 100644
--- a/tasks/language
+++ b/tasks/language
@@ -7,20 +7,33 @@ Description: Debian Edu language related educational applications
  teach a (foreign) language. It includes some typing applications.
 
 Depends:
- kanagram, trans-de-en, dict, gnome-utils,  aspell, wordnet, khangman, klettres, parley, klavaro
+ kanagram,
+ trans-de-en,
+ dict,
+ gnome-utils,
+ aspell,
+ wordnet,
+ khangman,
+ klettres,
+ parley,
+ klavaro,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- kiten, typespeed, festival, kwordquiz, ktouch
+ kiten,
+ typespeed,
+ festival,
+ kwordquiz,
+ ktouch,
 
 Suggests:
- brazilian-conjugate
+ brazilian-conjugate,
 
 Suggests:
- collatinus
+ collatinus,
 
 Suggests:
- verbiste-gnome
+ verbiste-gnome,
 
 Suggests:
- malted
+ malted,
diff --git a/tasks/laptop b/tasks/laptop
index 7347636..d4c4645 100644
--- a/tasks/laptop
+++ b/tasks/laptop
@@ -8,27 +8,32 @@ Description: Debian Edu laptop packages
  These packages extend the Debian laptop task.
 
 Depends:
- xserver-xorg-input-synaptics, laptop-mode-tools
+ xserver-xorg-input-synaptics,
+ laptop-mode-tools,
 
 Recommends:
- bluedevil
+ bluedevil,
 Suggests:
- bluez-cups, bluez-utils
+ bluez-cups,
+ bluez-utils,
 
 Recommends:
- unison
-             home directory server in sync.
+ unison,
 
 Recommends:
- powertop
+ powertop,
 
 Ignore:
  laptop-net,
-             battery-stats, hdapsd, fnfxd
+ battery-stats,
+ hdapsd,
+ fnfxd,
 
 Recommends:
- usb-modeswitch
+ usb-modeswitch,
 
 Ignore:
- build-essential, module-assistant,
-             ndiswrapper-source, linux-wlan-ng-source
+ build-essential,
+ module-assistant,
+ ndiswrapper-source,
+ linux-wlan-ng-source,
diff --git a/tasks/logic-games b/tasks/logic-games
index e01844d..5f0ffe1 100644
--- a/tasks/logic-games
+++ b/tasks/logic-games
@@ -7,8 +7,17 @@ Description: Debian Edu logic games
  teach logic to children.
 
 Depends:
- atomix, blinken, cgoban, lmemory, gnuchess, xboard, cgoban, gnugo, gtans
+ atomix,
+ blinken,
+ cgoban,
+ lmemory,
+ gnuchess,
+ xboard,
+ cgoban,
+ gnugo,
+ gtans,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- crafty, kdegames | gnome-games
+ crafty,
+ kdegames | gnome-games,
diff --git a/tasks/ltsp-server b/tasks/ltsp-server
index 88a0916..f99a493 100644
--- a/tasks/ltsp-server
+++ b/tasks/ltsp-server
@@ -7,51 +7,59 @@ Description: Debian Edu networked LTSP server packages
  networked LTSP server installations in the Debian Edu Blend.
 
 Depends:
- iptables
+ iptables,
 
 Depends:
- isc-dhcp-server-ldap
-NeedConfig:  yes
+ isc-dhcp-server-ldap,
+NeedConfig: yes
 
 Depends:
- atftpd | tftpd-hpa, tftp-hpa
-NeedConfig:  yes
+ atftpd | tftpd-hpa,
+ tftp-hpa,
+NeedConfig: yes
 
 Depends:
- ltsp-server, ltspfs, ldm-server, squashfs-tools
-NeedConfig:  yes
+ ltsp-server,
+ ltspfs,
+ ldm-server,
+ squashfs-tools,
+NeedConfig: yes
 
 Depends:
- ltsp-docs
+ ltsp-docs,
 
 Depends:
- rdiff-backup
+ rdiff-backup,
 
 Depends:
- nbd-server
+ nbd-server,
 
 Suggests:
- italc-master
-NeedConfig:  yes
+ italc-master,
+NeedConfig: yes
 
 Suggests:
- ltsp-controlaula
+ ltsp-controlaula,
 
 Suggests:
- italc-client
-NeedConfig:  yes
+ italc-client,
+NeedConfig: yes
 
 Depends:
- education-workstation
+ education-workstation,
 
 Recommends:
- pulseaudio, pulseaudio-esound-compat, pulseaudio-utils
+ pulseaudio,
+ pulseaudio-esound-compat,
+ pulseaudio-utils,
 Suggests:
- libpulse-mainloop-glib0
+ libpulse-mainloop-glib0,
 
 Recommends:
- nagios-nrpe-server, monitoring-plugins-standard
-NeedConfig:  yes - done by sitesummary-client using preseeding
+ nagios-nrpe-server,
+ monitoring-plugins-standard,
+NeedConfig: yes - done by sitesummary-client using preseeding
 
 Recommends:
- xrdp, tightvncserver
+ xrdp,
+ tightvncserver,
diff --git a/tasks/main-server b/tasks/main-server
index 41a31b5..f4f5d50 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -7,135 +7,179 @@ Description: Debian Edu main server packages
  main server installations in the Debian Edu Blend.
 
 Depends:
- education-networked
+ education-networked,
 
 Depends:
- iptables
+ iptables,
 Ignore:
- shorewall
-NeedConfig:  yes - set up default firewall rules
+ shorewall,
+NeedConfig: yes - set up default firewall rules
 
 Depends:
- avahi-daemon, libnss-mdns
+ avahi-daemon,
+ libnss-mdns,
 Suggests:
- avahi-discover, mdns-scan, avahi-autoipd
+ avahi-discover,
+ mdns-scan,
+ avahi-autoipd,
 
 Depends:
- bind9 | pdns-backend-ldap
+ bind9 | pdns-backend-ldap,
 Suggests:
- nslint, dnswalk, dlint
-NeedConfig:  yes - set a few well known DNS names, and more.
+ nslint,
+ dnswalk,
+ dlint,
+NeedConfig: yes - set a few well known DNS names, and more.
 
 Depends:
  ldap2zone | pdns-recursor
-NeedConfig:  yes - touch the corresponding bind zone file
+NeedConfig: yes - touch the corresponding bind zone file
 
 Depends:
- isc-dhcp-server-ldap, pxelinux, syslinux-common,
-             debian-installer-9-netboot-i386 | debian-installer-8-netboot-i386,
-             debian-installer-9-netboot-amd64 | debian-installer-8-netboot-amd64,
-             atftpd | tftpd-hpa
+ isc-dhcp-server-ldap,
+ pxelinux,
+ syslinux-common,
+ debian-installer-9-netboot-i386 | debian-installer-8-netboot-i386,
+ debian-installer-9-netboot-amd64 | debian-installer-8-netboot-amd64,
+ atftpd | tftpd-hpa,
 Recommends:
  memtest86+
-NeedConfig:  yes - set local IP range, DNS name and default routing
+NeedConfig: yes - set local IP range, DNS name and default routing
 
 Depends:
- slapd, openssl
-NeedConfig:  yes - generate certificates for ssl/tls support
+ slapd,
+ openssl,
+NeedConfig: yes - generate certificates for ssl/tls support
 
 Depends:
- dovecot-imapd
+ dovecot-imapd,
 Suggests:
- dovecot-pop3d
-NeedConfig:  yes
+ dovecot-pop3d,
+NeedConfig: yes
 
 Depends:
- dovecot-gssapi
-NeedConfig:  yes
+ dovecot-gssapi,
+NeedConfig: yes
 
 Depends:
- exim4-daemon-heavy
+ exim4-daemon-heavy,
 Avoid:
- courier-mta, deliver, maildrop, masqmail, nullmailer, sendmail,
-             sendmail-base, sendmail-bin, sendmail-cf, postfix,
-             hula-mta, esmtp, esmtp-run, nbsmtp, ssmtp, msmtp-mta
-NeedConfig:  yes
-
-Depends:
- links
-             good text-mode browser.
-
-Depends:
- nfs-kernel-server | nfs-server, samba, samba-common-bin,
-             makepasswd, tdb-tools, smbclient
+ courier-mta,
+ deliver,
+ maildrop,
+ masqmail,
+ nullmailer,
+ sendmail,
+ sendmail-base,
+ sendmail-bin,
+ sendmail-cf,
+ postfix,
+ hula-mta,
+ esmtp,
+ esmtp-run,
+ nbsmtp,
+ ssmtp,
+ msmtp-mta,
+NeedConfig: yes
+
+Depends:
+ links,
+
+Depends:
+ nfs-kernel-server | nfs-server,
+ samba,
+ samba-common-bin,
+ makepasswd,
+ tdb-tools,
+ smbclient,
 Suggests:
- samba-doc
-NeedConfig:  yes - specify which directories to distribute and configure
-             samba to use LDAP
+ samba-doc,
+NeedConfig: yes - specify which directories to distribute and configure samba to use LDAP
 
 Depends:
- apache2
+ apache2,
 Suggests:
- apache2-doc, webalizer
+ apache2-doc,
+ webalizer,
 
 Depends:
- squid
+ squid,
 Suggests:
- calamaris, squidguard, sarg
-NeedConfig:  yes
+ calamaris,
+ squidguard,
+ sarg,
+NeedConfig: yes
 
 Suggests:
- dsh
-NeedConfig:  yes - configure host groups
+ dsh,
+NeedConfig: yes - configure host groups
 
 Depends:
- ntp
-NeedConfig:  yes - set NTP server (client: ntp.intern, server: ntp.somewhere)
+ ntp,
+NeedConfig: yes - set NTP server (client: ntp.intern, server: ntp.somewhere)
 
 Depends:
- slbackup, slbackup-php
-NeedConfig:  yes - debconf (only the slbackup package)
+ slbackup,
+ slbackup-php,
+NeedConfig: yes - debconf (only the slbackup package)
 
 Avoid:
- telnetd, ftpd
+ telnetd,
+ ftpd,
 
 Depends:
- munin
-NeedConfig:  yes - done automatically by preseeding sitesummary
+ munin,
+NeedConfig: yes - done automatically by preseeding sitesummary
 
 Depends:
- icinga, monitoring-plugins-standard,
-             nagios-nrpe-plugin
-NeedConfig:  yes - done via preseeding: icingaadmin password, enable cgi.
+ icinga,
+ monitoring-plugins-standard,
+ nagios-nrpe-plugin,
+NeedConfig: yes - done via preseeding: icingaadmin password, enable cgi.
 
 Depends:
- sitesummary
+ sitesummary,
 Suggests:
- ocsinventory-server, ocsinventory-reports, default-mysql-client
-
-Depends:
- gosa, gosa-schema, gosa-plugin-samba, gosa-plugin-ldapmanager,
-             gosa-plugin-sudo, gosa-plugin-sudo-schema,
-             gosa-plugin-dhcp, gosa-plugin-dhcp-schema,
-             gosa-plugin-dns, gosa-plugin-dns-schema,
-             smbldap-tools,
-             gosa-help-en, gosa-help-de, gosa-help-fr, gosa-help-nl,
-             gosa-plugin-netgroups,
-             gosa-plugin-goto
-NeedConfig:  yes
+ ocsinventory-server,
+ ocsinventory-reports,
+ default-mysql-client,
+
+Depends:
+ gosa,
+ gosa-schema,
+ gosa-plugin-samba,
+ gosa-plugin-ldapmanager,
+ gosa-plugin-sudo,
+ gosa-plugin-sudo-schema,
+ gosa-plugin-dhcp,
+ gosa-plugin-dhcp-schema,
+ gosa-plugin-dns,
+ gosa-plugin-dns-schema,
+ smbldap-tools,
+ gosa-help-en,
+ gosa-help-de,
+ gosa-help-fr,
+ gosa-help-nl,
+ gosa-plugin-netgroups,
+ gosa-plugin-goto,
+NeedConfig: yes
 
 Ignore:
- koha
+ koha,
 Homepage:    http://www.koha.org/
 WNPP:        389876
 
 Depends:
- krb5-kdc, krb5-admin-server, krb5-kdc-ldap, libsasl2-modules-gssapi-mit
-NeedConfig:  yes - configure realm and the LDAP server as backend
+ krb5-kdc,
+ krb5-admin-server,
+ krb5-kdc-ldap,
+ libsasl2-modules-gssapi-mit,
+NeedConfig: yes - configure realm and the LDAP server as backend
 
 Recommends:
- libapache2-mod-auth-kerb
-NeedConfig:  yes - individual services like Nagios need to use the apache module
+ libapache2-mod-auth-kerb,
+NeedConfig: yes - individual services like Nagios need to use the apache module
 
 Suggests:
- krb5-doc, libsasl2-modules-ldap
+ krb5-doc,
+ libsasl2-modules-ldap,
diff --git a/tasks/mathematics b/tasks/mathematics
index ad240d4..93db6c8 100644
--- a/tasks/mathematics
+++ b/tasks/mathematics
@@ -7,19 +7,46 @@ Description: Debian Edu mathematical applications
  teach mathematics, geometry, and statistics.
 
 Depends:
- geogebra
+ geogebra,
 Recommends:
- kig
+ kig,
 
 Depends:
- drgeo, gnuplot, kbruch, kmplot, mathwar, rocs
+ drgeo,
+ gnuplot,
+ kbruch,
+ kmplot,
+ mathwar,
+ rocs,
 Recommends:
- education-menus, geomview, grace, graphmonkey, kalgebra, xabacus, cantor
+ education-menus,
+ geomview,
+ grace,
+ graphmonkey,
+ kalgebra,
+ xabacus,
+ cantor,
 Suggests:
- geogebra-kde, octave, lybniz, rkward, r-cran-rcmdr, euler, gretl, kile, mathomatic, pari-gp, yacas, scilab, xaos, abakus, qliss3d, k3dsurf, wxmaxima
+ geogebra-kde,
+ octave,
+ lybniz,
+ rkward,
+ r-cran-rcmdr,
+ euler,
+ gretl,
+ kile,
+ mathomatic,
+ pari-gp,
+ yacas,
+ scilab,
+ xaos,
+ abakus,
+ qliss3d,
+ k3dsurf,
+ wxmaxima,
 
 Depends:
- geonext
+ geonext,
 
 Suggests:
- algobox
+ algobox,
diff --git a/tasks/misc b/tasks/misc
index 4d78778..895078d 100644
--- a/tasks/misc
+++ b/tasks/misc
@@ -7,27 +7,33 @@ Description: Debian Edu miscellaneous applications for education
  for teaching purpose.
 
 Depends:
- childsplay, tuxpaint, tuxtype, gcompris, tilp2, pysycache
+ childsplay,
+ tuxpaint,
+ tuxtype,
+ gcompris,
+ tilp2,
+ pysycache,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- blinken, flashplugin-nonfree
+ blinken,
+ flashplugin-nonfree,
 
 Recommends:
- vym
+ vym,
 Suggests:
- freeplane
+ freeplane,
 
 Suggests:
- jclic
+ jclic,
 
 Suggests:
- ksociograma
+ ksociograma,
 WNPP: 262299
 
 Suggests:
- ggradebook
+ ggradebook,
 WNPP: 162059 162554
 
 Depends:
- scratch
+ scratch,
diff --git a/tasks/music b/tasks/music
index dbaaad6..29684b9 100644
--- a/tasks/music
+++ b/tasks/music
@@ -7,22 +7,40 @@ Description: Debian Edu music and sound applications
  teach music.
 
 Depends:
- kguitar, audacity, terminatorx, freebirth, hydrogen, noteedit,
-         denemo, solfege, audacious, score-reading-trainer, lmms, gtick,
-         lingot, pianobooster
+ kguitar,
+ audacity,
+ terminatorx,
+ freebirth,
+ hydrogen,
+ noteedit,
+ denemo,
+ solfege,
+ audacious,
+ score-reading-trainer,
+ lmms,
+ gtick,
+ lingot,
+ pianobooster,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- beast, ultrastar-ng-xine, lilypond, festival
+ beast,
+ ultrastar-ng-xine,
+ lilypond,
+ festival,
 Avoid:
- lilypond-doc
+ lilypond-doc,
 Ignore:
- cmt
+ cmt,
 
 Depends:
- rosegarden, swh-plugins, mcp-plugins, qsynth, fluidsynth,
-NeedConfig:  yes - configure the midi configuration
+ rosegarden,
+ swh-plugins,
+ mcp-plugins,
+ qsynth,
+ fluidsynth,
+NeedConfig: yes - configure the midi configuration
 
 Depends:
- lenmus
+ lenmus,
 WNPP: 480510
diff --git a/tasks/networked b/tasks/networked
index 509cf33..56e052c 100644
--- a/tasks/networked
+++ b/tasks/networked
@@ -8,13 +8,13 @@ Description: Debian Edu network packages
  and minimal) in the Debian Edu Blend.
 
 Depends:
- education-networked-common
+ education-networked-common,
 
 Depends:
- libpam-krb5
+ libpam-krb5,
 
 Depends:
- nscd
+ nscd,
 
 Depends:
- network-manager
+ network-manager,
diff --git a/tasks/networked-common b/tasks/networked-common
index 891a7b4..e401a0a 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -8,76 +8,83 @@ Description: Debian Edu common networking packages
  and main-server, but not standalone) in the Debian Edu Blend.
 
 Depends:
- education-common
+ education-common,
 
 Depends:
- libnss-ldapd, nslcd
-NeedConfig:  yes - set LDAP server to name of server
+ libnss-ldapd,
+ nslcd,
+NeedConfig: yes - set LDAP server to name of server
 
 Depends:
- ng-utils, ldap-utils, ldapvi
+ ng-utils,
+ ldap-utils,
+ ldapvi,
 
 Depends:
- ntpdate, ntp
+ ntpdate,
+ ntp,
 Suggests:
- ntp-doc
-NeedConfig:  yes - set NTP server (client: ntp.local, server: ntp.extern)
+ ntp-doc,
+NeedConfig: yes - set NTP server (client: ntp.local, server: ntp.extern)
 
 Depends:
- nfs-common
+ nfs-common,
 
 Avoid:
- fam
+ fam,
 
 Depends:
- autofs-ldap | autofs5-ldap
-NeedConfig:  yes - making sure autofs is disabled on mainserver
+ autofs-ldap | autofs5-ldap,
+NeedConfig: yes - making sure autofs is disabled on mainserver
 
 Depends:
- sudo-ldap
+ sudo-ldap,
 
 Depends:
- krb5-clients, krb5-user, libsasl2-modules-gssapi-mit
+ krb5-clients,
+ krb5-user,
+ libsasl2-modules-gssapi-mit,
 
 Suggests:
- cifs-utils, libpam-mount
+ cifs-utils,
+ libpam-mount,
 
 Depends:
- munin-node
-NeedConfig:  yes - configured by sitesummary-client preseeding.
+ munin-node,
+NeedConfig: yes - configured by sitesummary-client preseeding.
 
 Depends:
- sitesummary-client
+ sitesummary-client,
 Suggests:
- ocsinventory-agent
-NeedConfig:  yes - specify URL to collector
+ ocsinventory-agent,
+NeedConfig: yes - specify URL to collector
 
 Recommends:
- killer
+ killer,
 
 Ignore:
- autolog
+ autolog,
 
 Suggests:
- libpam-ccreds, nscd, libpam-sss, libnss-sss
-             <URL: http://www.flyn.org/laptopldap/laptopldap.html >,
-             <URL: http://fedoraproject.org/wiki/Features/DisconnectedOperation > and
-             <URL:http://www.builderau.com.au/program/linux/soa/Authentication-caching-with-nscd/0,339028299,339285682,00.htm>
-NeedConfig:  yes
+ libpam-ccreds,
+ nscd,
+ libpam-sss,
+ libnss-sss,
+NeedConfig: yes
 
 Depends:
- openssh-server
+ openssh-server,
 Suggests:
- fail2ban
+ fail2ban,
 Avoid:
- ssh-askpass
-NeedConfig:  yes - enable X login etc
+ ssh-askpass,
+NeedConfig: yes - enable X login etc
 
 Depends:
- shutdown-at-night
+ shutdown-at-night,
 Recommends:
- nvram-wakeup
-NeedConfig:  yes - enable wake-on-lan sending based on sitesummary information.
+ nvram-wakeup,
+NeedConfig: yes - enable wake-on-lan sending based on sitesummary information.
 
 Ignore:
- unburden-home-dir
+ unburden-home-dir,
diff --git a/tasks/physics b/tasks/physics
index 8ab68c0..1bc7994 100644
--- a/tasks/physics
+++ b/tasks/physics
@@ -7,11 +7,15 @@ Description: Debian Edu physics related applications
  teach physics.
 
 Depends:
- planets, step
+ planets,
+ step,
 Recommends:
- education-menus
+ education-menus,
 Suggests:
- python-pyode, etoys, xoscope, kturtle
+ python-pyode,
+ etoys,
+ xoscope,
+ kturtle,
 
 Suggests:
- ejs
+ ejs,
diff --git a/tasks/roaming-workstation b/tasks/roaming-workstation
index f531df7..6fe0bdc 100644
--- a/tasks/roaming-workstation
+++ b/tasks/roaming-workstation
@@ -8,27 +8,28 @@ Description: Debian Edu networked roaming workstation packages
  Blend where the client might go offine once in a while.
 
 Depends:
- education-networked-common
+ education-networked-common,
 
 Depends:
- education-desktop-other
+ education-desktop-other,
 
 Depends:
  network-manager-gnome | plasma-widget-networkmanagement
 
 Depends:
- libnss-mdns
+ libnss-mdns,
 
 Depends:
- libpam-mklocaluser
+ libpam-mklocaluser,
 
 Depends:
- libpam-sss, libnss-sss
-NeedConfig:  yes - sssd.conf need to point to our LDAP and Kerberos server
+ libpam-sss,
+ libnss-sss,
+NeedConfig: yes - sssd.conf need to point to our LDAP and Kerberos server
 
 Recommends:
- krb5-auth-dialog
+ krb5-auth-dialog,
 
 Depends:
- gosa-desktop
-NeedConfig:  yes - override upstream url using /etc/gosa/desktoprc
+ gosa-desktop,
+NeedConfig: yes - override upstream url using /etc/gosa/desktoprc
diff --git a/tasks/services b/tasks/services
index a9f6838..ac882e3 100644
--- a/tasks/services
+++ b/tasks/services
@@ -9,6 +9,6 @@ Description: Debian Edu services for educational institutions
  web content filter...
 
 Depends:
- dansguardian
+ dansguardian,
 Suggests:
- wims
+ wims,
diff --git a/tasks/standalone b/tasks/standalone
index 7a33bff..b66d09f 100644
--- a/tasks/standalone
+++ b/tasks/standalone
@@ -7,16 +7,16 @@ Description: Debian Edu standalone workstation packages
  small standalone workstation installations in the Debian Edu Blend.
 
 Depends:
- education-common
+ education-common,
 
 Depends:
- education-desktop-other
+ education-desktop-other,
 
 Depends:
- sudo
+ sudo,
 
 Depends:
- plasma-nm | network-manager-gnome
+ plasma-nm | network-manager-gnome,
 
 Depends:
- libnss-mdns
+ libnss-mdns,
diff --git a/tasks/thin-client b/tasks/thin-client
index c4f44ca..d7d5cb3 100644
--- a/tasks/thin-client
+++ b/tasks/thin-client
@@ -6,12 +6,14 @@ Description: Debian Edu networked thin client packages
  networked thin client installations in the Debian Edu Blend.
 
 Depends:
- ltsp-client, iputils-ping
+ ltsp-client,
+ iputils-ping,
 Recommends:
- alsa-utils, acpi-support-base
+ alsa-utils,
+ acpi-support-base,
 
 Depends:
- debian-edu-artwork
+ debian-edu-artwork,
 
 Depends:
- sitesummary-client
+ sitesummary-client,
diff --git a/tasks/workstation b/tasks/workstation
index 0da0fc5..43bced6 100644
--- a/tasks/workstation
+++ b/tasks/workstation
@@ -8,21 +8,20 @@ Description: Debian Edu networked workstation packages
  Blend.
 
 Depends:
- education-networked
-             skolelinux machines
+ education-networked,
 
 Depends:
- education-desktop-other
+ education-desktop-other,
 
 Recommends:
- krb5-auth-dialog
+ krb5-auth-dialog,
 
 Suggests:
- kredentials
+ kredentials,
 
 Recommends:
- jxplorer
+ jxplorer,
 
 Depends:
- gosa-desktop
-NeedConfig:  yes - override upstream url using /etc/gosa/desktoprc
+ gosa-desktop,
+NeedConfig: yes - override upstream url using /etc/gosa/desktoprc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git



More information about the debian-edu-commits mailing list