[debian-edu-commits] debian-edu/ 15/18: move all package names below Depends:/Recommends:/Suggests:.

Mike Gabriel sunweaver at debian.org
Sat Aug 5 04:25:58 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 5caa81b47a0f38d84c9f900303163d7a3d24b397
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 4 17:40:59 2017 -0400

    move all package names below Depends:/Recommends:/Suggests:.
---
 tasks/astronomy              |  12 ++-
 tasks/chemistry              |   9 +-
 tasks/common                 |  97 +++++++++++++-------
 tasks/desktop-gnome          |  18 ++--
 tasks/desktop-kde            |  39 +++++---
 tasks/desktop-lxde           |  21 +++--
 tasks/desktop-mate           |  18 ++--
 tasks/desktop-other          | 207 ++++++++++++++++++++++++++++---------------
 tasks/desktop-xfce           |  18 ++--
 tasks/development            |  51 +++++++----
 tasks/electronics            |  12 ++-
 tasks/geography              |   9 +-
 tasks/graphics               |  12 ++-
 tasks/lang-da                |   6 +-
 tasks/lang-da-desktop        |  12 ++-
 tasks/lang-da-desktop-kde    |   3 +-
 tasks/lang-de                |   6 +-
 tasks/lang-de-desktop        |  15 ++--
 tasks/lang-de-desktop-kde    |   3 +-
 tasks/lang-es                |   6 +-
 tasks/lang-es-desktop        |  15 ++--
 tasks/lang-es-desktop-kde    |   3 +-
 tasks/lang-fr                |   6 +-
 tasks/lang-fr-desktop        |  18 ++--
 tasks/lang-fr-desktop-kde    |   3 +-
 tasks/lang-he                |   3 +-
 tasks/lang-he-desktop        |  12 ++-
 tasks/lang-he-desktop-kde    |   3 +-
 tasks/lang-it                |   6 +-
 tasks/lang-it-desktop        |  12 ++-
 tasks/lang-it-desktop-kde    |   3 +-
 tasks/lang-ja                |   3 +-
 tasks/lang-ja-desktop        |  15 ++--
 tasks/lang-ja-desktop-kde    |   3 +-
 tasks/lang-no                |   6 +-
 tasks/lang-no-desktop        |  15 ++--
 tasks/lang-no-desktop-kde    |   3 +-
 tasks/lang-se                |   3 +-
 tasks/lang-zh-tw             |   3 +-
 tasks/lang-zh-tw-desktop     |   6 +-
 tasks/lang-zh-tw-desktop-kde |   3 +-
 tasks/language               |  21 +++--
 tasks/laptop                 |  18 ++--
 tasks/logic-games            |   9 +-
 tasks/ltsp-server            |  45 ++++++----
 tasks/main-server            |  96 +++++++++++++-------
 tasks/mathematics            |  21 +++--
 tasks/misc                   |  27 ++++--
 tasks/music                  |  15 ++--
 tasks/networked              |  12 ++-
 tasks/networked-common       |  57 ++++++++----
 tasks/physics                |  12 ++-
 tasks/roaming-workstation    |  24 +++--
 tasks/services               |   6 +-
 tasks/standalone             |  15 ++--
 tasks/thin-client            |  12 ++-
 tasks/workstation            |  18 ++--
 57 files changed, 750 insertions(+), 376 deletions(-)

diff --git a/tasks/astronomy b/tasks/astronomy
index a5f781f..9ecd96d 100644
--- a/tasks/astronomy
+++ b/tasks/astronomy
@@ -6,9 +6,13 @@ Description: Debian Edu astronomy related applications
  This metapackage depends on various applications that can be used to
  teach astronomy.
 
-Depends: celestia-gnome | celestia-glut | celestia
+Depends:
+ celestia-gnome | celestia-glut | celestia
 
-Depends: gpredict, stellarium, xplanet, xplanet-images, kstars
-Recommends: education-menus
-Suggests: sunclock, xtide, xtide-data
+Depends:
+ gpredict, stellarium, xplanet, xplanet-images, kstars
+Recommends:
+ education-menus
+Suggests:
+ sunclock, xtide, xtide-data
 Ignore:   astronomical-almanac, lightspeed, openuniverse
diff --git a/tasks/chemistry b/tasks/chemistry
index 3471c7f..1ee0226 100644
--- a/tasks/chemistry
+++ b/tasks/chemistry
@@ -6,7 +6,10 @@ Description: Debian Edu chemistry related applications
  This metapackage depends on various applications that can be used to
  teach chemistry.
 
-Depends: avogadro, easychem, gchempaint, gdis, pymol,
+Depends:
+ avogadro, easychem, gchempaint, gdis, pymol,
          viewmol, gperiodic, chemtool, kalzium
-Recommends: education-menus
-Suggests:   rasmol
+Recommends:
+ education-menus
+Suggests:
+ rasmol
diff --git a/tasks/common b/tasks/common
index 7ead552..1fd465f 100644
--- a/tasks/common
+++ b/tasks/common
@@ -6,67 +6,92 @@ Description: Debian Edu common packages
  A metapackage containing dependencies for packages required on all
  installations in the Debian Edu Blend.
 
-Depends:     rsyslog
+Depends:
+ rsyslog
 NeedConfig:  yes - Todo
-Suggests:    rsyslog-doc
+Suggests:
+ rsyslog-doc
 DontAvoid:   sysklogd (can't avoid this one yet, debootstrap lists it as required)
 
-Depends:     procinfo
+Depends:
+ procinfo
 
-Depends:     openssh-client
+Depends:
+ openssh-client
 Avoid:       ssh-askpass
 
-Depends:     cfengine2
+Depends:
+ cfengine2
 NeedConfig:  yes
 
-Depends:     vim
+Depends:
+ vim
 Avoid:       vim-gnome, vim-gtk, vim-lesstif, vim-nox
 
-Suggests:    emacs
+Suggests:
+ emacs
 
-Depends:     nullidentd | ident-server, openbsd-inetd
+Depends:
+ nullidentd | ident-server, openbsd-inetd
 
-Depends:     man-db, manpages, ethtool, hdparm, pciutils,
+Depends:
+ 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
-Suggests:    apticron | cron-apt, nictools-nopci, nvram-wakeup, debsecan
-
-Depends:     reportbug
-Recommends:  python-gtk2, python-vte
-
-Depends:     bind9-host, traceroute, tcptraceroute, iftop, less,
+Recommends:
+ iputils-arping | arping, finger, gdebi-core | gdebi
+Suggests:
+ apticron | cron-apt, nictools-nopci, nvram-wakeup, debsecan
+
+Depends:
+ reportbug
+Recommends:
+ 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
-Recommends:  rsync, memtest86+, deborphan, hddtemp, htop, screen, mc,
+Recommends:
+ rsync, memtest86+, deborphan, hddtemp, htop, screen, mc,
              lshw, dhcping, convmv, system-config-lvm
-Suggests:    dpt-i2o-raidutils | raidutils,
+Suggests:
+ dpt-i2o-raidutils | raidutils,
              cpqarrayd, arrayprobe, mpt-status,
              isag, modconf, wireshark
 Ignore:      smartmontools | smartsuite, smart-notifier,
              rkhunter
 
-Recommends:  gdb, valgrind
+Recommends:
+ gdb, valgrind
 
-Depends:     debian-edu-doc-en
+Depends:
+ debian-edu-doc-en
 
-Depends:     debian-edu-config, debian-edu-install, debconf-utils
+Depends:
+ debian-edu-config, debian-edu-install, debconf-utils
 
-Suggests:    popularity-contest, debian-goodies
+Suggests:
+ popularity-contest, debian-goodies
 NeedConfig:  yes - get it to submit to both debian and debian-edu.
 
-Depends:     consolekit, libpam-ck-connector
+Depends:
+ consolekit, libpam-ck-connector
 
-Recommends:  libpam-tmpdir
+Recommends:
+ libpam-tmpdir
 
-Recommends:  libnss-myhostname
+Recommends:
+ libnss-myhostname
 
-Depends:     unattended-upgrades
+Depends:
+ unattended-upgrades
 
-Suggests:    kexec-tools
+Suggests:
+ kexec-tools
 
 Ignore:      apache2-mpm-worker,
              brltty, brltty-x11,
@@ -182,19 +207,25 @@ Avoid:       linux-image-2.6-powerpc-smp, linux-image-2.6.32-5-powerpc-smp,
 
 Ignore:      tmpreaper
 
-Suggests:    firmware-bnx2, firmware-ipw2x00, firmware-iwlwifi, firmware-qlogic,
+Suggests:
+ firmware-bnx2, firmware-ipw2x00, firmware-iwlwifi, firmware-qlogic,
              firmware-ralink
 
-Depends:     cups, foomatic-db, foomatic-db-engine, foomatic-db-gutenprint,
+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
-Suggests:    foo2zjs
+Suggests:
+ foo2zjs
 Ignore:      escputil
 Avoid:       lpr
 
-Recommends:  bash-completion
+Recommends:
+ bash-completion
 
-Depends:     cifs-utils
+Depends:
+ cifs-utils
 
-Recommends:  command-not-found
+Recommends:
+ command-not-found
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index 3a8b981..882ebc6 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -7,20 +7,26 @@ Description: Debian Edu GNOME desktop applications
  This metapackage depends on various GNOME office and desktop applications
  that are useful for teachers and their students.
 
-Depends:     education-common
+Depends:
+ education-common
 
-Depends:      gdm3 | x-display-manager,
+Depends:
+ gdm3 | x-display-manager,
               gnome, gimp,
               inkscape,
               synaptic
-Suggests:     dasher, gnome-mag, gok,
+Suggests:
+ dasher, gnome-mag, gok,
               gnome-accessibility-themes,  gnome-orca
 Avoid:        xdm
 
-Depends:      libreoffice-gnome, libreoffice-gtk3,  libreoffice-writer,
+Depends:
+ 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
+Depends:
+ totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
 
-Recommends:  ssh-askpass-gnome | ssh-askpass
+Recommends:
+ ssh-askpass-gnome | ssh-askpass
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index 0867a9b..b11ca37 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -7,11 +7,14 @@ Description: Debian Edu KDE desktop applications
  This metapackage depends on various KDE office and desktop applications
  that are useful for teachers and their students.
 
-Depends:     education-common
+Depends:
+ education-common
 
-Depends:     kde-standard, kwin-x11, konqueror,
+Depends:
+ kde-standard, kwin-x11, konqueror,
              konsole, kmix, kdepasswd
-Recommends:  kcalc, ark, kmail, kaddressbook, kcharselect,
+Recommends:
+ kcalc, ark, kmail, kaddressbook, kcharselect,
              kdf, kde-spectacle, korganizer, konversation | kopete,
              konq-plugins, kio-audiocd,
              kdegraphics-thumbnailers,
@@ -20,29 +23,39 @@ Recommends:  kcalc, ark, kmail, kaddressbook, kcharselect,
              kipi-plugins,
              kdeaccessibility,
              kturtle
-Suggests:    knode, kde-config-cron, kuser, kscd, kfind,
+Suggests:
+ knode, kde-config-cron, kuser, kscd, kfind,
              kruler, kfilereplace, kde-zeroconf,
              kde-full
 
-Recommends:  bluedevil
+Recommends:
+ bluedevil
 
-Depends:     lightdm | x-display-manager
+Depends:
+ lightdm | x-display-manager
 Avoid:       xdm
 NeedConfig:  yes - artwork
 
-Depends:     dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer
+Depends:
+ dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer
 
-Depends:     kdeedu
-Recommends:  print-manager, kwalletmanager,
+Depends:
+ kdeedu
+Recommends:
+ print-manager, kwalletmanager,
              kinfocenter
 
-Recommends:  krfb, krdc
+Recommends:
+ krfb, krdc
 
-Recommends:  kde-l10n-es, kde-l10n-it, kde-l10n-de, kde-l10n-fr,
+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
 
-Recommends:  libreoffice-kde
+Recommends:
+ libreoffice-kde
 
-Recommends:  ksshaskpass | ssh-askpass
+Recommends:
+ ksshaskpass | ssh-askpass
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index f1841dd..c4c9b01 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -7,20 +7,27 @@ Description: Debian Edu LXDE desktop applications
  This metapackage depends on various LXDE components and lightweight
  desktop applications that are useful for teachers and their students.
 
-Depends:     education-common
+Depends:
+ education-common
 
-Depends:      lxde, desktop-file-utils
-Recommends:   evince, galculator, osmo, parcellite,
+Depends:
+ lxde, desktop-file-utils
+Recommends:
+ evince, galculator, osmo, parcellite,
               pidgin, hexchat, mtpaint, fotoxx, gimp,
               inkscape,
               synaptic
 
-Recommends:  blueman
+Recommends:
+ blueman
 
-Depends:      lightdm | x-display-manager
+Depends:
+ lightdm | x-display-manager
 Avoid:        xdm
 NeedConfig:   yes - artwork
 
-Depends:     totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
+Depends:
+ totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
 
-Recommends:  ssh-askpass
+Recommends:
+ ssh-askpass
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index 1a096c7..3b0cf60 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -7,20 +7,26 @@ Description: Debian Edu MATE desktop applications
  This metapackage depends on various MATE office and desktop applications
  that are useful for teachers and their students.
 
-Depends:     education-common
+Depends:
+ education-common
 
-Depends:      lightdm | x-display-manager,
+Depends:
+ lightdm | x-display-manager,
               mate-desktop-environment, mate-desktop-environment-extras,
               mate-settings-daemon-pulse, mate-media-pulse,
               gimp, inkscape,
               synaptic
-Suggests:     dasher
+Suggests:
+ dasher
 Avoid:        xdm
 
-Depends:      libreoffice-gtk2,  libreoffice-writer,
+Depends:
+ 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
+Depends:
+ vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer
 
-Recommends:  ssh-askpass-gnome | ssh-askpass
+Recommends:
+ ssh-askpass-gnome | ssh-askpass
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 9eb1f08..cfe8574 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -6,21 +6,28 @@ Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
-Depends:     xorg, xserver-xorg-input-all, xserver-xorg-video-all, libgl1-mesa-dri,
+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
-Suggests:    xfonts-100dpi-transcoded, fonts-mlym
+Suggests:
+ xfonts-100dpi-transcoded, fonts-mlym
 
-Suggests:    fonts-larabie-deco
+Suggests:
+ fonts-larabie-deco
 
-Depends:     synaptic
+Depends:
+ synaptic
 
-Depends:     alsa-utils
+Depends:
+ alsa-utils
 
-Depends:     gcj-jre-headless,
+Depends:
+ gcj-jre-headless,
              libreoffice
-Recommends:  libreoffice-l10n-el,
+Recommends:
+ libreoffice-l10n-el,
              libreoffice-l10n-de,
              libreoffice-l10n-fr,
              libreoffice-l10n-es,
@@ -34,7 +41,8 @@ Recommends:  libreoffice-l10n-el,
              libreoffice-help-sv,
              libreoffice-help-pt-br,
              openclipart-libreoffice, openclipart
-Suggests:    libreoffice-filter-binfilter,
+Suggests:
+ libreoffice-filter-binfilter,
              libreoffice-l10n-en-za,
              libreoffice-help-zh-tw,
              libreoffice-l10n-zh-tw,
@@ -107,7 +115,8 @@ Ignore:      libreoffice-help-cs,
              libreoffice-l10n-zh-cn,
              libreoffice-l10n-zu
 
-Recommends:  firefox-esr,
+Recommends:
+ firefox-esr,
              firefox-esr-l10n-de,
              firefox-esr-l10n-el,
              firefox-esr-l10n-it,
@@ -118,7 +127,8 @@ Recommends:  firefox-esr,
              firefox-esr-l10n-es-ar,
              firefox-esr-l10n-sv-se,
              firefox-esr-l10n-pt-br
-Suggests:    firefox-esr-l10n-af,
+Suggests:
+ firefox-esr-l10n-af,
              firefox-esr-l10n-ar,
              firefox-esr-l10n-be,
              firefox-esr-l10n-bg,
@@ -147,15 +157,19 @@ Suggests:    firefox-esr-l10n-af,
              and suggest the rests.
 NeedConfig:  yes, Cache, Printerapp, proxy server
 
-Recommends:  chromium
+Recommends:
+ chromium
 NeedConfig:  yes - set system wide proxy settings
 
-Depends:     gecko-mediaplayer | mozilla-plugin-vlc
+Depends:
+ gecko-mediaplayer | mozilla-plugin-vlc
              firefox plugin for this.
 
-Recommends:  djview-plugin
+Recommends:
+ djview-plugin
 
-Recommends:  thunderbird,
+Recommends:
+ thunderbird,
              thunderbird-l10n-ca,
              thunderbird-l10n-de,
              thunderbird-l10n-el,
@@ -164,47 +178,66 @@ Recommends:  thunderbird,
              thunderbird-l10n-it
 NeedConfig:  yes - Cache, Printerapp, proxy server
 
-Depends:     konqueror-plugin-gnash, browser-plugin-gnash | mozilla-plugin-gnash
-Suggests:    flashplugin-nonfree
+Depends:
+ konqueror-plugin-gnash, browser-plugin-gnash | mozilla-plugin-gnash
+Suggests:
+ flashplugin-nonfree
 Ignore:      browser-plugin-lightspark
 Avoid:       flashplugin-nonfree
 
-Recommends:  default-jre, icedtea-8-plugin
+Recommends:
+ default-jre, icedtea-8-plugin
 
-Depends:     debian-edu-artwork, plymouth, plymouth-themes
+Depends:
+ debian-edu-artwork, plymouth, plymouth-themes
 NeedConfig:  yes - kdm and kde need to be configured to use it.
 
-Depends:     gnupg2 | gnupg, gnupg-agent
-Suggests:    gnupg-doc
+Depends:
+ gnupg2 | gnupg, gnupg-agent
+Suggests:
+ gnupg-doc
 Avoid:       pgp
 
-Depends:     avahi-daemon, libnss-mdns
-Suggests:    avahi-discover, mdns-scan, avahi-autoipd
+Depends:
+ avahi-daemon, libnss-mdns
+Suggests:
+ avahi-discover, mdns-scan, avahi-autoipd
 
-Depends:     cups-client, cups-bsd
+Depends:
+ cups-client, cups-bsd
 
-Depends:     unzip, zip, bzip2
+Depends:
+ unzip, zip, bzip2
 
 Ignore:      ifplugd
 NeedConfig:  yes - the if listed in /etc/default/ifplugd must not has auto eth(?) in interface
 
-Depends:     isc-dhcp-client | dhcp3-client
+Depends:
+ isc-dhcp-client | dhcp3-client
 Avoid:       pump
 
-Depends:     freerdp-x11 | rdesktop
+Depends:
+ freerdp-x11 | rdesktop
              have a Linux Desktop
 
-Depends:     ktuberling
+Depends:
+ ktuberling
 
-Depends:     openshot, kdenlive, stopmotion
-Recommends:  vgrabbj, dvgrab, libav-tools
-Suggests:    kino, pitivi, xine-ui, libdvdcss2, openmovieeditor
+Depends:
+ openshot, kdenlive, stopmotion
+Recommends:
+ vgrabbj, dvgrab, libav-tools
+Suggests:
+ kino, pitivi, xine-ui, libdvdcss2, openmovieeditor
 
 Ignore:      clamav, clamav-docs, clamav-freshclam, clamav-data
 
-Depends:     gcompris
-Recommends:  gnuchess, gnucap, tuxpaint, tuxpaint-config
-Suggests:    gcompris-sound-de, gcompris-sound-en,
+Depends:
+ 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,
@@ -215,40 +248,56 @@ Ignore:      gcompris-sound-ar, gcompris-sound-bg, gcompris-sound-br,
              gcompris-sound-id, gcompris-sound-mr, gcompris-sound-so,
              gcompris-sound-sr, gcompris-sound-ur
 
-Suggests:    smbclient
+Suggests:
+ smbclient
 
-Suggests:    ncftp, wget
+Suggests:
+ ncftp, wget
 
-Suggests:    pgdesigner
+Suggests:
+ pgdesigner
 
-Suggests:    kig
+Suggests:
+ kig
 
-Suggests:    postgresql-client, postgresql
+Suggests:
+ postgresql-client, postgresql
 
-Suggests:    sql-ledger
+Suggests:
+ sql-ledger
 
-Recommends:  planner
+Recommends:
+ planner
 
-Suggests:    gnuplot
+Suggests:
+ gnuplot
 
-Suggests:    texlive, texlive-doc-base, lacheck, auctex, texlive-latex-base
+Suggests:
+ texlive, texlive-doc-base, lacheck, auctex, texlive-latex-base
 Ignore:      texlive-full
 
-Suggests:    lyx,
+Suggests:
+ lyx,
              texmacs
 
-Depends:     inkscape
-Recommends:  gimp, gimp-data-extras, gimp-ufraw
-Suggests:    netpbm, gv, dia
+Depends:
+ inkscape
+Recommends:
+ gimp, gimp-data-extras, gimp-ufraw
+Suggests:
+ netpbm, gv, dia
 Ignore:      gimp-help-de, gimp-help-en, gimp-help-fr,
              gimp-help-it, gimp-help-nl, gimp-help-sv
 
-Recommends:  cheese
+Recommends:
+ cheese
 
-Recommends:  sane, sane-utils, skanlite, ocrad
+Recommends:
+ sane, sane-utils, skanlite, ocrad
 NeedConfig:  yes
 
-Recommends:  hunspell-en-gb,
+Recommends:
+ hunspell-en-gb,
              hunspell-de-de,
              myspell-fr,
              myspell-es,
@@ -259,58 +308,74 @@ Recommends:  hunspell-en-gb,
              myspell-nl,
              myspell-pt-pt,
              tmispell-voikko
-Suggests:    hunspell-de-at, hunspell-de-ch, myspell-fr-gut
+Suggests:
+ hunspell-de-at, hunspell-de-ch, myspell-fr-gut
 
-Suggests:    lightspeed
+Suggests:
+ lightspeed
 
-Recommends:  k3b | brasero, k3b-i18n | brasero
+Recommends:
+ k3b | brasero, k3b-i18n | brasero
 NeedConfig:  yes - access to the cdrom group, and kernel module loading via pam_groups.so
 
-Suggests:    kppp
+Suggests:
+ kppp
 
-Suggests:    pppoeconf
+Suggests:
+ pppoeconf
 
-Suggests:    kuser
+Suggests:
+ kuser
 
 Ignore:      f-spot
 
-Recommends:  tuxmath
+Recommends:
+ tuxmath
 
 Ignore:      ttf-mscorefonts-installer
 
 Ignore:      nvidia-settings, dosemu,
              kmessedwords, gs,
 
-Suggests:    tablix2, gtablix, fet
+Suggests:
+ tablix2, gtablix, fet
 
 Ignore:      qemu, qemu-launcher, qemuctl
 
-Suggests:    monopd
+Suggests:
+ monopd
 
-Suggests:    fonts-arphic-uming, im-switch, scim-chewing, scim-tables-zh
+Suggests:
+ fonts-arphic-uming, im-switch, scim-chewing, scim-tables-zh
 
 Ignore:      fonts-dzongkha
 
-Suggests:    rsibreak | workrave
+Suggests:
+ rsibreak | workrave
 
-Suggests:    kpat, kbattleship,
+Suggests:
+ kpat, kbattleship,
              kbounce, kspaceduel,
              kgoldrunner, kolf, kmines, konquest, kshisen,
              katomic, klickety, kblackbox, kjumpingcube,
              kmahjongg, kreversi
 Ignore:      kdegames
 
-Recommends:  education-astronomy, education-chemistry,
+Recommends:
+ 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
+Suggests:
+ wine
 
-Suggests:    gettext
+Suggests:
+ gettext
 
-Suggests:    kernel-package, libncurses5-dev
+Suggests:
+ kernel-package, libncurses5-dev
 
 Ignore:      mgp
 
@@ -333,11 +398,15 @@ Ignore:      kde-l10n-ar, kde-l10n-bg,
              kde-l10n-tr, kde-l10n-uk,
              kde-l10n-zhcn, kde-l10n-zhtw
 
-Suggests:    controlaula
+Suggests:
+ controlaula
 NeedConfig:  yes
 
-Recommends:  gtk-recordmydesktop
+Recommends:
+ gtk-recordmydesktop
 
-Recommends:  pavucontrol
+Recommends:
+ pavucontrol
 
-Recommends:  goplay
+Recommends:
+ goplay
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index e80f7c0..5d13125 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -7,13 +7,19 @@ Description: Debian Edu Xfce desktop applications
  This metapackage depends on various XFCE components that are useful
  for teachers and their students.
 
-Depends:      education-common
+Depends:
+ education-common
 
-Depends:      xfce4, xfce4-goodies
+Depends:
+ xfce4, xfce4-goodies
 
-Depends:      lightdm | x-display-manager
-Recommends:   system-config-printer, tango-icon-theme
+Depends:
+ lightdm | x-display-manager
+Recommends:
+ system-config-printer, tango-icon-theme
 
-Recommends:  blueman
+Recommends:
+ blueman
 
-Recommends:  ssh-askpass
+Recommends:
+ ssh-askpass
diff --git a/tasks/development b/tasks/development
index 865c073..654ae04 100644
--- a/tasks/development
+++ b/tasks/development
@@ -8,41 +8,58 @@ Description: Debian Edu software development related educational applications
  development environments that are easy to learn and lead to quick
  results for beginners.
 
-Recommends: education-menus
+Recommends:
+ education-menus
 
-Depends: fp-compiler, fp-ide, fp-units-base, fp-units-gfx, fp-utils, fp-units-gtk2,
+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
 
-Depends: lazarus
+Depends:
+ lazarus
 
-Depends: gambas2
+Depends:
+ gambas2
 
-Suggests: eclipse
+Suggests:
+ 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
+Depends:
+ bwbasic
 
-Depends: kturtle
+Depends:
+ kturtle
 
-Depends: kommander
+Depends:
+ kommander
 
-Suggests: tk8.5-dev, tcl8.5-dev
+Suggests:
+ tk8.5-dev, tcl8.5-dev
 
-Suggests: swi-prolog, swi-prolog-doc
+Suggests:
+ swi-prolog, swi-prolog-doc
 
-Depends: squeak-vm
+Depends:
+ squeak-vm
 
-Depends: python
-Recommends: drpython, gvrng, python-easygui
+Depends:
+ python
+Recommends:
+ drpython, gvrng, python-easygui
 
-Depends: umbrello
+Depends:
+ umbrello
 
-Recommends: bluefish
+Recommends:
+ bluefish
 
-Depends: kdevelop
+Depends:
+ kdevelop
 
-Depends:     build-essential, autoconf, subversion, ddd
+Depends:
+ build-essential, autoconf, subversion, ddd
 
diff --git a/tasks/electronics b/tasks/electronics
index 522ef38..7d561df 100644
--- a/tasks/electronics
+++ b/tasks/electronics
@@ -6,9 +6,13 @@ Description: Debian Edu electronics related applications
  This metapackage depends on various applications that can be used to
  teach electronics.
 
-Depends: qucs, gpsim, oregano
-Recommends: education-menus, xoscope
-Suggests: kicad, kicad-doc-en, kicad-doc-de, kicad-doc-es, kicad-doc-fr,
+Depends:
+ qucs, gpsim, oregano
+Recommends:
+ education-menus, xoscope
+Suggests:
+ kicad, kicad-doc-en, kicad-doc-de, kicad-doc-es, kicad-doc-fr,
           electric, pcb, xcircuit, freehdl, gtkwave
 
-Depends: ktechlab
+Depends:
+ ktechlab
diff --git a/tasks/geography b/tasks/geography
index 2cd30d7..ec215ec 100644
--- a/tasks/geography
+++ b/tasks/geography
@@ -6,9 +6,12 @@ Description: Debian Edu applications for geography
  This metapackage depends on various applications that can be used
  to teach geography.
 
-Depends:  kgeography, marble
-Recommends: education-menus
-Suggests: gpscorrelate, qlandkartegt, viking, googleearth-package,
+Depends:
+ kgeography, marble
+Recommends:
+ education-menus
+Suggests:
+ gpscorrelate, qlandkartegt, viking, googleearth-package,
           mapserver-bin, openscenegraph, grass, qgis, gmt,
           thuban, earth3d
 Ignore:   drawmap, gdal-bin, libgeo-coordinates-utm-perl,
diff --git a/tasks/graphics b/tasks/graphics
index d292a42..e125bc8 100644
--- a/tasks/graphics
+++ b/tasks/graphics
@@ -6,9 +6,13 @@ Description: Debian Edu graphics related applications
  This metapackage depends on various applications that can be used to
  teach graphics and pictural art.
 
-Depends: inkscape, gimp, librecad, dia
-Recommends: education-menus, xpaint
-Suggests:  xfig, xaos, tgif, hugin, blender
+Depends:
+ inkscape, gimp, librecad, dia
+Recommends:
+ education-menus, xpaint
+Suggests:
+ xfig, xaos, tgif, hugin, blender
 Ignore: dcraw
 
-Depends:     scribus
+Depends:
+ scribus
diff --git a/tasks/lang-da b/tasks/lang-da
index dc03733..367eca2 100644
--- a/tasks/lang-da
+++ b/tasks/lang-da
@@ -6,6 +6,8 @@ Description: Debian Edu applications for Danish installs
  This metapackage depends on various packages to install when the Danish
  language is selected during installation.
 
-Recommends:  myspell-da
+Recommends:
+ myspell-da
 
-Depends:     debian-edu-doc-da
+Depends:
+ debian-edu-doc-da
diff --git a/tasks/lang-da-desktop b/tasks/lang-da-desktop
index a7e8bce..b2b79dc 100644
--- a/tasks/lang-da-desktop
+++ b/tasks/lang-da-desktop
@@ -6,11 +6,15 @@ 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
+Depends:
+ gcompris-sound-da
 
-Recommends:  libreoffice-help-da,
+Recommends:
+ libreoffice-help-da,
              libreoffice-l10n-da
 
-Recommends:  firefox-esr-l10n-da
+Recommends:
+ firefox-esr-l10n-da
 
-Suggests:    thunderbird-l10n-da
+Suggests:
+ thunderbird-l10n-da
diff --git a/tasks/lang-da-desktop-kde b/tasks/lang-da-desktop-kde
index 59f1fb6..792b1be 100644
--- a/tasks/lang-da-desktop-kde
+++ b/tasks/lang-da-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: Danish Debian Edu KDE desktop applications
  This task localises the KDE desktop in Danish.
 
-Recommends:  kde-l10n-da
+Recommends:
+ kde-l10n-da
diff --git a/tasks/lang-de b/tasks/lang-de
index d80a960..8e2ff75 100644
--- a/tasks/lang-de
+++ b/tasks/lang-de
@@ -6,6 +6,8 @@ Description: Debian Edu applications for German installs
  This subtask depends on various German packages to install when the German
  language is selected during installation.
 
-Recommends:  hunspell-de-at, hunspell-de-ch, hunspell-de-de
+Recommends:
+ hunspell-de-at, hunspell-de-ch, hunspell-de-de
 
-Depends:     debian-edu-doc-de
+Depends:
+ debian-edu-doc-de
diff --git a/tasks/lang-de-desktop b/tasks/lang-de-desktop
index c43f589..6d876ce 100644
--- a/tasks/lang-de-desktop
+++ b/tasks/lang-de-desktop
@@ -6,16 +6,21 @@ 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
+Recommends:
+ gcompris-sound-de
 
-Recommends:  gimp-help-de
+Recommends:
+ gimp-help-de
 
-Recommends:  libreoffice-help-de,
+Recommends:
+ libreoffice-help-de,
              hyphen-de,
              libreoffice-l10n-de,
              mythes-de, mythes-de-ch
 
-Recommends:  firefox-esr-l10n-de
+Recommends:
+ firefox-esr-l10n-de
 
-Suggests:    thunderbird-l10n-de
+Suggests:
+ thunderbird-l10n-de
 
diff --git a/tasks/lang-de-desktop-kde b/tasks/lang-de-desktop-kde
index 365baab..64a8d99 100644
--- a/tasks/lang-de-desktop-kde
+++ b/tasks/lang-de-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: German Debian Edu KDE desktop applications
  This task localises the KDE desktop in German.
 
-Recommends:  kde-l10n-de
+Recommends:
+ kde-l10n-de
diff --git a/tasks/lang-es b/tasks/lang-es
index e222703..06aeefe 100644
--- a/tasks/lang-es
+++ b/tasks/lang-es
@@ -6,7 +6,9 @@ Description: Debian Edu applications for Spanish installs
  This metapackage depends on various packages to install when the Spanish
  language is selected during installation.
 
-Recommends: myspell-es,
+Recommends:
+ myspell-es,
              manpages-es-extra
 
-Depends:     debian-edu-doc-es
+Depends:
+ debian-edu-doc-es
diff --git a/tasks/lang-es-desktop b/tasks/lang-es-desktop
index a649427..d1a4814 100644
--- a/tasks/lang-es-desktop
+++ b/tasks/lang-es-desktop
@@ -6,13 +6,18 @@ 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
+Depends:
+ gcompris-sound-es
 
-Recommends:  gimp-help-es
+Recommends:
+ gimp-help-es
 
-Recommends:  libreoffice-help-es,
+Recommends:
+ libreoffice-help-es,
              libreoffice-l10n-es
 
-Recommends:  firefox-esr-l10n-es-es
+Recommends:
+ firefox-esr-l10n-es-es
 
-Suggests:    thunderbird-l10n-es-es
+Suggests:
+ thunderbird-l10n-es-es
diff --git a/tasks/lang-es-desktop-kde b/tasks/lang-es-desktop-kde
index a4e34b8..8744eda 100644
--- a/tasks/lang-es-desktop-kde
+++ b/tasks/lang-es-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: Spanish Debian Edu KDE desktop applications
  This task localises the KDE desktop in Spanish.
 
-Recommends:  kde-l10n-es
+Recommends:
+ kde-l10n-es
diff --git a/tasks/lang-fr b/tasks/lang-fr
index b6171b5..b523d84 100644
--- a/tasks/lang-fr
+++ b/tasks/lang-fr
@@ -6,7 +6,9 @@ Description: Debian Edu applications for French installs
  This subtask depends on various French packages to install when the French
  language is selected during installation.
 
-Recommends:  myspell-fr,
+Recommends:
+ myspell-fr,
              manpages-fr-extra
 
-Depends:     debian-edu-doc-fr
+Depends:
+ debian-edu-doc-fr
diff --git a/tasks/lang-fr-desktop b/tasks/lang-fr-desktop
index 0ee0350..1ede484 100644
--- a/tasks/lang-fr-desktop
+++ b/tasks/lang-fr-desktop
@@ -6,17 +6,23 @@ 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
+Recommends:
+ gcompris-sound-fr
 
-Recommends:  gimp-help-fr
+Recommends:
+ gimp-help-fr
 
-Recommends:  libreoffice-help-fr,
+Recommends:
+ libreoffice-help-fr,
              hyphen-fr,
              libreoffice-l10n-fr,
              mythes-fr
 
-Recommends:  firefox-esr-l10n-fr
+Recommends:
+ firefox-esr-l10n-fr
 
-Suggests:    thunderbird-l10n-fr
+Suggests:
+ thunderbird-l10n-fr
 
-Suggests:    aptitude-doc-fr
+Suggests:
+ aptitude-doc-fr
diff --git a/tasks/lang-fr-desktop-kde b/tasks/lang-fr-desktop-kde
index abb97b5..3aef3a9 100644
--- a/tasks/lang-fr-desktop-kde
+++ b/tasks/lang-fr-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: French Debian Edu KDE desktop applications
  This task localises the KDE desktop in French.
 
-Recommends:  kde-l10n-fr
+Recommends:
+ kde-l10n-fr
diff --git a/tasks/lang-he b/tasks/lang-he
index 7e6f593..dde4401 100644
--- a/tasks/lang-he
+++ b/tasks/lang-he
@@ -6,4 +6,5 @@ Description: Debian Edu applications for Hebrew installs
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
-Recommends:  aspell-he, hspell, myspell-he
+Recommends:
+ aspell-he, hspell, myspell-he
diff --git a/tasks/lang-he-desktop b/tasks/lang-he-desktop
index 887981a..fced8be 100644
--- a/tasks/lang-he-desktop
+++ b/tasks/lang-he-desktop
@@ -6,11 +6,15 @@ 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
+Recommends:
+ libfribidi0, culmus
 
-Recommends:  libreoffice-l10n-he
+Recommends:
+ libreoffice-l10n-he
 
-Recommends:  firefox-esr-l10n-he
+Recommends:
+ firefox-esr-l10n-he
 
-Suggests:    thunderbird-l10n-he
+Suggests:
+ thunderbird-l10n-he
 
diff --git a/tasks/lang-he-desktop-kde b/tasks/lang-he-desktop-kde
index 9f7c178..500acdf 100644
--- a/tasks/lang-he-desktop-kde
+++ b/tasks/lang-he-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: Hebrew Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Hebrew.
 
-Recommends:  kde-l10n-he
+Recommends:
+ kde-l10n-he
diff --git a/tasks/lang-it b/tasks/lang-it
index c2f7324..c2fd869 100644
--- a/tasks/lang-it
+++ b/tasks/lang-it
@@ -6,6 +6,8 @@ Description: Debian Edu applications for Italian installs
  This metapackage depends on various packages to install when the Spanish
  language is selected during installation.
 
-Recommends: hunspell-it
+Recommends:
+ hunspell-it
 
-Depends:     debian-edu-doc-it
+Depends:
+ debian-edu-doc-it
diff --git a/tasks/lang-it-desktop b/tasks/lang-it-desktop
index 42e9a54..ccec43f 100644
--- a/tasks/lang-it-desktop
+++ b/tasks/lang-it-desktop
@@ -6,12 +6,16 @@ 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
+Depends:
+ gcompris-sound-it
 
-Recommends:  gimp-help-it
+Recommends:
+ gimp-help-it
 
-Recommends:  libreoffice-help-it,
+Recommends:
+ libreoffice-help-it,
              libreoffice-l10n-it,
              mythes-it
 
-Recommends:  firefox-esr-l10n-it
+Recommends:
+ firefox-esr-l10n-it
diff --git a/tasks/lang-it-desktop-kde b/tasks/lang-it-desktop-kde
index bf27673..df83f7c 100644
--- a/tasks/lang-it-desktop-kde
+++ b/tasks/lang-it-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: Italian Debian Edu KDE desktop applications
  This task localises the KDE desktop in Italian.
 
-Recommends:  kde-l10n-it
+Recommends:
+ kde-l10n-it
diff --git a/tasks/lang-ja b/tasks/lang-ja
index 7654091..dc034b8 100644
--- a/tasks/lang-ja
+++ b/tasks/lang-ja
@@ -6,4 +6,5 @@ Description: Debian Edu applications for Japanese installs
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
-Depends:     debian-edu-doc-ja
+Depends:
+ debian-edu-doc-ja
diff --git a/tasks/lang-ja-desktop b/tasks/lang-ja-desktop
index 912b303..372b2c7 100644
--- a/tasks/lang-ja-desktop
+++ b/tasks/lang-ja-desktop
@@ -6,14 +6,19 @@ 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
+Recommends:
+ fonts-vlgothic, ibus-anthy
 Avoid:       cmap-adobe-japan1
 
-Recommends:  libreoffice-l10n-ja,
+Recommends:
+ libreoffice-l10n-ja,
              libreoffice-help-ja
 
-Recommends:  firefox-esr-l10n-ja
+Recommends:
+ firefox-esr-l10n-ja
 
-Suggests:    thunderbird-l10n-ja
+Suggests:
+ thunderbird-l10n-ja
 
-Suggests:    aptitude-doc-ja
+Suggests:
+ aptitude-doc-ja
diff --git a/tasks/lang-ja-desktop-kde b/tasks/lang-ja-desktop-kde
index 628646e..f155ee3 100644
--- a/tasks/lang-ja-desktop-kde
+++ b/tasks/lang-ja-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: Japanese Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Japanese.
 
-Recommends:  kde-l10n-ja
+Recommends:
+ kde-l10n-ja
diff --git a/tasks/lang-no b/tasks/lang-no
index 19b0ec6..3a1c0b0 100644
--- a/tasks/lang-no
+++ b/tasks/lang-no
@@ -6,7 +6,9 @@ Description: Debian Edu applications for Norwegian installs
  This subtask depends on various packages to install when Norwegian
  languages are selected during installation.
 
-Recommends:  myspell-nb, aspell-no,
+Recommends:
+ myspell-nb, aspell-no,
              myspell-nn
 
-Depends:     debian-edu-doc-nb
+Depends:
+ debian-edu-doc-nb
diff --git a/tasks/lang-no-desktop b/tasks/lang-no-desktop
index 6633217..16153ea 100644
--- a/tasks/lang-no-desktop
+++ b/tasks/lang-no-desktop
@@ -6,15 +6,20 @@ 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
+Recommends:
+ gcompris-sound-nb
 
-Recommends:  gimp-help-nn
+Recommends:
+ gimp-help-nn
 
-Recommends:  libreoffice-l10n-nb,
+Recommends:
+ libreoffice-l10n-nb,
              libreoffice-l10n-nn
 
-Recommends:  firefox-esr-l10n-nb-no,
+Recommends:
+ firefox-esr-l10n-nb-no,
              firefox-esr-l10n-nn-no
 
-Suggests:    thunderbird-l10n-nb-no, thunderbird-l10n-nn-no
+Suggests:
+ thunderbird-l10n-nb-no, thunderbird-l10n-nn-no
 
diff --git a/tasks/lang-no-desktop-kde b/tasks/lang-no-desktop-kde
index 6308c8c..604047c 100644
--- a/tasks/lang-no-desktop-kde
+++ b/tasks/lang-no-desktop-kde
@@ -5,5 +5,6 @@ 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,
+Recommends:
+ kde-l10n-nn,
              kde-l10n-nb
diff --git a/tasks/lang-se b/tasks/lang-se
index af56275..8c59e6d 100644
--- a/tasks/lang-se
+++ b/tasks/lang-se
@@ -6,4 +6,5 @@ Description: Debian Edu applications for North Sami installs
  This subtask depends on various packages to install when the North
  Sami language is selected during installation.
 
-Recommends:  hunspell-se
+Recommends:
+ hunspell-se
diff --git a/tasks/lang-zh-tw b/tasks/lang-zh-tw
index 999cad3..7de9db5 100644
--- a/tasks/lang-zh-tw
+++ b/tasks/lang-zh-tw
@@ -6,4 +6,5 @@ Description: Debian Edu applications for Traditional Chinese installs
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
 
-Depends:     fonts-arphic-ukai
+Depends:
+ fonts-arphic-ukai
diff --git a/tasks/lang-zh-tw-desktop b/tasks/lang-zh-tw-desktop
index c70478e..2dd595c 100644
--- a/tasks/lang-zh-tw-desktop
+++ b/tasks/lang-zh-tw-desktop
@@ -6,8 +6,10 @@ 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,
+Depends:
+ libreoffice-help-zh-tw,
              libreoffice-l10n-zh-tw
 
-Depends:     fonts-arphic-uming, fonts-wqy-zenhei, fonts-wqy-microhei,
+Depends:
+ 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 1a3ac72..b965f5f 100644
--- a/tasks/lang-zh-tw-desktop-kde
+++ b/tasks/lang-zh-tw-desktop-kde
@@ -5,4 +5,5 @@ Architecture: any
 Description: Traditional Chinese Debian Edu KDE desktop applications
  This task localises the KDE desktop in Traditional Chinese.
 
-Recommends:  kde-l10n-zhtw
+Recommends:
+ kde-l10n-zhtw
diff --git a/tasks/language b/tasks/language
index 88cbe46..af996ae 100644
--- a/tasks/language
+++ b/tasks/language
@@ -6,14 +6,21 @@ Description: Debian Edu language related educational applications
  This metapackage depends on various applications that can be used to
  teach a (foreign) language. It includes some typing applications.
 
-Depends: kanagram, trans-de-en, dict, gnome-utils,  aspell, wordnet, khangman, klettres, parley, klavaro
-Recommends: education-menus
-Suggests: kiten, typespeed, festival, kwordquiz, ktouch
+Depends:
+ kanagram, trans-de-en, dict, gnome-utils,  aspell, wordnet, khangman, klettres, parley, klavaro
+Recommends:
+ education-menus
+Suggests:
+ kiten, typespeed, festival, kwordquiz, ktouch
 
-Suggests: brazilian-conjugate
+Suggests:
+ brazilian-conjugate
 
-Suggests: collatinus
+Suggests:
+ collatinus
 
-Suggests:  verbiste-gnome
+Suggests:
+ verbiste-gnome
 
-Suggests: malted
+Suggests:
+ malted
diff --git a/tasks/laptop b/tasks/laptop
index fada05b..d7def40 100644
--- a/tasks/laptop
+++ b/tasks/laptop
@@ -7,20 +7,26 @@ Description: Debian Edu laptop packages
  laptop installations in the Debian Edu Blend.
  These packages extend the Debian laptop task.
 
-Depends:     xserver-xorg-input-synaptics, laptop-mode-tools
+Depends:
+ xserver-xorg-input-synaptics, laptop-mode-tools
 
-Recommends:  bluedevil
-Suggests:    bluez-cups, bluez-utils
+Recommends:
+ bluedevil
+Suggests:
+ bluez-cups, bluez-utils
 
-Recommends:  unison
+Recommends:
+ unison
              home directory server in sync.
 
-Recommends:  powertop
+Recommends:
+ powertop
 
 Ignore:      laptop-net,
              battery-stats, hdapsd, fnfxd
 
-Recommends:  usb-modeswitch
+Recommends:
+ usb-modeswitch
 
 Ignore:      build-essential, module-assistant,
              ndiswrapper-source, linux-wlan-ng-source
diff --git a/tasks/logic-games b/tasks/logic-games
index e335306..e01844d 100644
--- a/tasks/logic-games
+++ b/tasks/logic-games
@@ -6,6 +6,9 @@ Description: Debian Edu logic games
  This metapackage depends on various logic games that can be used to
  teach logic to children.
 
-Depends: atomix, blinken, cgoban, lmemory, gnuchess, xboard, cgoban, gnugo, gtans
-Recommends: education-menus
-Suggests: crafty, kdegames | gnome-games
+Depends:
+ atomix, blinken, cgoban, lmemory, gnuchess, xboard, cgoban, gnugo, gtans
+Recommends:
+ education-menus
+Suggests:
+ crafty, kdegames | gnome-games
diff --git a/tasks/ltsp-server b/tasks/ltsp-server
index d66adc2..88a0916 100644
--- a/tasks/ltsp-server
+++ b/tasks/ltsp-server
@@ -6,37 +6,52 @@ Description: Debian Edu networked LTSP server packages
  A metapackage containing dependencies for packages required on all
  networked LTSP server installations in the Debian Edu Blend.
 
-Depends:     iptables
+Depends:
+ iptables
 
-Depends:     isc-dhcp-server-ldap
+Depends:
+ isc-dhcp-server-ldap
 NeedConfig:  yes
 
-Depends:     atftpd | tftpd-hpa, tftp-hpa
+Depends:
+ atftpd | tftpd-hpa, tftp-hpa
 NeedConfig:  yes
 
-Depends:     ltsp-server, ltspfs, ldm-server, squashfs-tools
+Depends:
+ ltsp-server, ltspfs, ldm-server, squashfs-tools
 NeedConfig:  yes
 
-Depends:     ltsp-docs
+Depends:
+ ltsp-docs
 
-Depends:     rdiff-backup
+Depends:
+ rdiff-backup
 
-Depends:     nbd-server
+Depends:
+ nbd-server
 
-Suggests:    italc-master
+Suggests:
+ italc-master
 NeedConfig:  yes
 
-Suggests:    ltsp-controlaula
+Suggests:
+ ltsp-controlaula
 
-Suggests:    italc-client
+Suggests:
+ italc-client
 NeedConfig:  yes
 
-Depends:     education-workstation
+Depends:
+ education-workstation
 
-Recommends:  pulseaudio, pulseaudio-esound-compat, pulseaudio-utils
-Suggests:    libpulse-mainloop-glib0
+Recommends:
+ pulseaudio, pulseaudio-esound-compat, pulseaudio-utils
+Suggests:
+ libpulse-mainloop-glib0
 
-Recommends:  nagios-nrpe-server, monitoring-plugins-standard
+Recommends:
+ nagios-nrpe-server, monitoring-plugins-standard
 NeedConfig:  yes - done by sitesummary-client using preseeding
 
-Recommends:  xrdp, tightvncserver
+Recommends:
+ xrdp, tightvncserver
diff --git a/tasks/main-server b/tasks/main-server
index 43430ea..f35a978 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -6,83 +6,112 @@ Description: Debian Edu main server packages
  A metapackage containing dependencies for packages required on all
  main server installations in the Debian Edu Blend.
 
-Depends:     education-networked
+Depends:
+ education-networked
 
-Depends:     iptables
+Depends:
+ iptables
 Ignore:      shorewall
 NeedConfig:  yes - set up default firewall rules
 
-Depends:     avahi-daemon, libnss-mdns
-Suggests:    avahi-discover, mdns-scan, avahi-autoipd
+Depends:
+ avahi-daemon, libnss-mdns
+Suggests:
+ avahi-discover, mdns-scan, avahi-autoipd
 
-Depends:     bind9 | pdns-backend-ldap
-Suggests:    nslint, dnswalk, dlint
+Depends:
+ bind9 | pdns-backend-ldap
+Suggests:
+ nslint, dnswalk, dlint
 NeedConfig:  yes - set a few well known DNS names, and more.
 
-Depends:     ldap2zone | pdns-recursor
+Depends:
+ ldap2zone | pdns-recursor
 NeedConfig:  yes - touch the corresponding bind zone file
 
-Depends:     isc-dhcp-server-ldap, pxelinux, syslinux-common,
+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
-Recommends:  memtest86+
+Recommends:
+ memtest86+
 NeedConfig:  yes - set local IP range, DNS name and default routing
 
-Depends:     slapd, openssl
+Depends:
+ slapd, openssl
 NeedConfig:  yes - generate certificates for ssl/tls support
 
-Depends:     dovecot-imapd
-Suggests:    dovecot-pop3d
+Depends:
+ dovecot-imapd
+Suggests:
+ dovecot-pop3d
 NeedConfig:  yes
 
-Depends:     dovecot-gssapi
+Depends:
+ dovecot-gssapi
 NeedConfig:  yes
 
-Depends:     exim4-daemon-heavy
+Depends:
+ 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
+Depends:
+ links
              good text-mode browser.
 
-Depends:     nfs-kernel-server | nfs-server, samba, samba-common-bin,
+Depends:
+ nfs-kernel-server | nfs-server, samba, samba-common-bin,
              makepasswd, tdb-tools, smbclient
-Suggests:    samba-doc
+Suggests:
+ samba-doc
 NeedConfig:  yes - specify which directories to distribute and configure
              samba to use LDAP
 
-Depends:     apache2
-Suggests:    apache2-doc, webalizer
+Depends:
+ apache2
+Suggests:
+ apache2-doc, webalizer
 
-Depends:     squid
-Suggests:    calamaris, squidguard, sarg
+Depends:
+ squid
+Suggests:
+ calamaris, squidguard, sarg
 NeedConfig:  yes
 
-Suggests:    dsh
+Suggests:
+ dsh
 NeedConfig:  yes - configure host groups
 
-Depends:     ntp
+Depends:
+ ntp
 NeedConfig:  yes - set NTP server (client: ntp.intern, server: ntp.somewhere)
 
-Depends:     slbackup, slbackup-php
+Depends:
+ slbackup, slbackup-php
 NeedConfig:  yes - debconf (only the slbackup package)
 
 Avoid:       telnetd, ftpd
 
-Depends:     munin
+Depends:
+ munin
 NeedConfig:  yes - done automatically by preseeding sitesummary
 
-Depends:     icinga, monitoring-plugins-standard,
+Depends:
+ icinga, monitoring-plugins-standard,
              nagios-nrpe-plugin
 NeedConfig:  yes - done via preseeding: icingaadmin password, enable cgi.
 
-Depends:     sitesummary
-Suggests:    ocsinventory-server, ocsinventory-reports, default-mysql-client
+Depends:
+ sitesummary
+Suggests:
+ ocsinventory-server, ocsinventory-reports, default-mysql-client
 
-Depends:     gosa, gosa-schema, gosa-plugin-samba, gosa-plugin-ldapmanager,
+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,
@@ -96,10 +125,13 @@ Ignore:      koha
 Homepage:    http://www.koha.org/
 WNPP:        389876
 
-Depends:     krb5-kdc, krb5-admin-server, krb5-kdc-ldap, libsasl2-modules-gssapi-mit
+Depends:
+ 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
+Recommends:
+ libapache2-mod-auth-kerb
 NeedConfig:  yes - individual services like Nagios need to use the apache module
 
-Suggests:    krb5-doc, libsasl2-modules-ldap
+Suggests:
+ krb5-doc, libsasl2-modules-ldap
diff --git a/tasks/mathematics b/tasks/mathematics
index efa791f..ad240d4 100644
--- a/tasks/mathematics
+++ b/tasks/mathematics
@@ -6,13 +6,20 @@ Description: Debian Edu mathematical applications
  This metapackage depends on various applications that can be used to
  teach mathematics, geometry, and statistics.
 
-Depends:     geogebra
-Recommends:  kig
+Depends:
+ geogebra
+Recommends:
+ kig
 
-Depends: drgeo, gnuplot, kbruch, kmplot, mathwar, rocs
-Recommends: 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
+Depends:
+ drgeo, gnuplot, kbruch, kmplot, mathwar, rocs
+Recommends:
+ 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
 
-Depends: geonext
+Depends:
+ geonext
 
-Suggests: algobox
+Suggests:
+ algobox
diff --git a/tasks/misc b/tasks/misc
index b4627ad..4d78778 100644
--- a/tasks/misc
+++ b/tasks/misc
@@ -6,19 +6,28 @@ Description: Debian Edu miscellaneous applications for education
  This metapackage depends on miscellaneous applications that can be useful
  for teaching purpose.
 
-Depends: childsplay, tuxpaint, tuxtype, gcompris, tilp2, pysycache
-Recommends: education-menus
-Suggests:  blinken, flashplugin-nonfree
+Depends:
+ childsplay, tuxpaint, tuxtype, gcompris, tilp2, pysycache
+Recommends:
+ education-menus
+Suggests:
+ blinken, flashplugin-nonfree
 
-Recommends:  vym
-Suggests:    freeplane
+Recommends:
+ vym
+Suggests:
+ freeplane
 
-Suggests: jclic
+Suggests:
+ jclic
 
-Suggests: ksociograma
+Suggests:
+ ksociograma
 WNPP: 262299
 
-Suggests: ggradebook
+Suggests:
+ ggradebook
 WNPP: 162059 162554
 
-Depends:     scratch
+Depends:
+ scratch
diff --git a/tasks/music b/tasks/music
index eaf1647..05e6abd 100644
--- a/tasks/music
+++ b/tasks/music
@@ -6,16 +6,21 @@ Description: Debian Edu music and sound applications
  This metapackage depends on various applications that can be used to
  teach music.
 
-Depends: kguitar, audacity, terminatorx, freebirth, hydrogen, noteedit,
+Depends:
+ kguitar, audacity, terminatorx, freebirth, hydrogen, noteedit,
          denemo, solfege, audacious, score-reading-trainer, lmms, gtick,
          lingot, pianobooster
-Recommends: education-menus
-Suggests: beast, ultrastar-ng-xine, lilypond, festival
+Recommends:
+ education-menus
+Suggests:
+ beast, ultrastar-ng-xine, lilypond, festival
 Avoid: lilypond-doc
 Ignore: cmt
 
-Depends:     rosegarden, swh-plugins, mcp-plugins, qsynth, fluidsynth,
+Depends:
+ rosegarden, swh-plugins, mcp-plugins, qsynth, fluidsynth,
 NeedConfig:  yes - configure the midi configuration
 
-Depends: lenmus
+Depends:
+ lenmus
 WNPP: 480510
diff --git a/tasks/networked b/tasks/networked
index ac55c6e..509cf33 100644
--- a/tasks/networked
+++ b/tasks/networked
@@ -7,10 +7,14 @@ Description: Debian Edu network packages
  network installations (with the exception of roaming workstation
  and minimal) in the Debian Edu Blend.
 
-Depends:     education-networked-common
+Depends:
+ education-networked-common
 
-Depends:     libpam-krb5
+Depends:
+ libpam-krb5
 
-Depends:     nscd
+Depends:
+ nscd
 
-Depends:     network-manager
+Depends:
+ network-manager
diff --git a/tasks/networked-common b/tasks/networked-common
index 3b9ec7c..59d7950 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -7,54 +7,73 @@ Description: Debian Edu common networking packages
  network installations (workstation, roaming workstation, minimal
  and main-server, but not standalone) in the Debian Edu Blend.
 
-Depends:     education-common
+Depends:
+ education-common
 
-Depends:     libnss-ldapd, nslcd
+Depends:
+ libnss-ldapd, nslcd
 NeedConfig:  yes - set LDAP server to name of server
 
-Depends:     ng-utils, ldap-utils, ldapvi
+Depends:
+ ng-utils, ldap-utils, ldapvi
 
-Depends:     ntpdate, ntp
-Suggests:    ntp-doc
+Depends:
+ ntpdate, ntp
+Suggests:
+ ntp-doc
 NeedConfig:  yes - set NTP server (client: ntp.local, server: ntp.extern)
 
-Depends:     nfs-common
+Depends:
+ nfs-common
 
 Avoid:       fam
 
-Depends:     autofs-ldap | autofs5-ldap
+Depends:
+ autofs-ldap | autofs5-ldap
 NeedConfig:  yes - making sure autofs is disabled on mainserver
 
-Depends:     sudo-ldap
+Depends:
+ sudo-ldap
 
-Depends:     krb5-clients, krb5-user, libsasl2-modules-gssapi-mit
+Depends:
+ krb5-clients, krb5-user, libsasl2-modules-gssapi-mit
 
-Suggests:    cifs-utils, libpam-mount
+Suggests:
+ cifs-utils, libpam-mount
 
-Depends:     munin-node
+Depends:
+ munin-node
 NeedConfig:  yes - configured by sitesummary-client preseeding.
 
-Depends:     sitesummary-client
-Suggests:    ocsinventory-agent
+Depends:
+ sitesummary-client
+Suggests:
+ ocsinventory-agent
 NeedConfig:  yes - specify URL to collector
 
-Recommends:  killer
+Recommends:
+ killer
 
 Ignore:      autolog
 
-Suggests:    libpam-ccreds, nscd, libpam-sss, libnss-sss
+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
 
-Depends:     openssh-server
-Suggests:    fail2ban
+Depends:
+ openssh-server
+Suggests:
+ fail2ban
 Avoid:       ssh-askpass
 NeedConfig:  yes - enable X login etc
 
-Depends:     shutdown-at-night
-Recommends:  nvram-wakeup
+Depends:
+ shutdown-at-night
+Recommends:
+ nvram-wakeup
 NeedConfig:  yes - enable wake-on-lan sending based on sitesummary information.
 
 Ignore:      unburden-home-dir
diff --git a/tasks/physics b/tasks/physics
index 1e101e0..8ab68c0 100644
--- a/tasks/physics
+++ b/tasks/physics
@@ -6,8 +6,12 @@ Description: Debian Edu physics related applications
  This metapackage depends on various applications that can be used to
  teach physics.
 
-Depends: planets, step
-Recommends: education-menus
-Suggests: python-pyode, etoys, xoscope, kturtle
+Depends:
+ planets, step
+Recommends:
+ education-menus
+Suggests:
+ python-pyode, etoys, xoscope, kturtle
 
-Suggests: ejs
+Suggests:
+ ejs
diff --git a/tasks/roaming-workstation b/tasks/roaming-workstation
index bb23835..f531df7 100644
--- a/tasks/roaming-workstation
+++ b/tasks/roaming-workstation
@@ -7,20 +7,28 @@ Description: Debian Edu networked roaming workstation packages
  networked workstation (thick client) installations in the Debian Edu
  Blend where the client might go offine once in a while.
 
-Depends:     education-networked-common
+Depends:
+ education-networked-common
 
-Depends:     education-desktop-other
+Depends:
+ education-desktop-other
 
-Depends:     network-manager-gnome | plasma-widget-networkmanagement
+Depends:
+ network-manager-gnome | plasma-widget-networkmanagement
 
-Depends:     libnss-mdns
+Depends:
+ libnss-mdns
 
-Depends:     libpam-mklocaluser
+Depends:
+ libpam-mklocaluser
 
-Depends:     libpam-sss, libnss-sss
+Depends:
+ libpam-sss, libnss-sss
 NeedConfig:  yes - sssd.conf need to point to our LDAP and Kerberos server
 
-Recommends:  krb5-auth-dialog
+Recommends:
+ krb5-auth-dialog
 
-Depends:     gosa-desktop
+Depends:
+ gosa-desktop
 NeedConfig:  yes - override upstream url using /etc/gosa/desktoprc
diff --git a/tasks/services b/tasks/services
index bbe3407..a9f6838 100644
--- a/tasks/services
+++ b/tasks/services
@@ -8,5 +8,7 @@ Description: Debian Edu services for educational institutions
  e-learning services, online documentation repository,
  web content filter...
 
-Depends: dansguardian
-Suggests: wims
+Depends:
+ dansguardian
+Suggests:
+ wims
diff --git a/tasks/standalone b/tasks/standalone
index 09c6d09..7a33bff 100644
--- a/tasks/standalone
+++ b/tasks/standalone
@@ -6,12 +6,17 @@ Description: Debian Edu standalone workstation packages
  A metapackage containing dependencies for packages required on all
  small standalone workstation installations in the Debian Edu Blend.
 
-Depends:     education-common
+Depends:
+ education-common
 
-Depends:     education-desktop-other
+Depends:
+ education-desktop-other
 
-Depends:     sudo
+Depends:
+ sudo
 
-Depends:     plasma-nm | network-manager-gnome
+Depends:
+ plasma-nm | network-manager-gnome
 
-Depends:     libnss-mdns
+Depends:
+ libnss-mdns
diff --git a/tasks/thin-client b/tasks/thin-client
index e070305..c4f44ca 100644
--- a/tasks/thin-client
+++ b/tasks/thin-client
@@ -5,9 +5,13 @@ Description: Debian Edu networked thin client packages
  This metapackage depends on various packages required on all
  networked thin client installations in the Debian Edu Blend.
 
-Depends:     ltsp-client, iputils-ping
-Recommends:  alsa-utils, acpi-support-base
+Depends:
+ ltsp-client, iputils-ping
+Recommends:
+ alsa-utils, acpi-support-base
 
-Depends:     debian-edu-artwork
+Depends:
+ debian-edu-artwork
 
-Depends:     sitesummary-client
+Depends:
+ sitesummary-client
diff --git a/tasks/workstation b/tasks/workstation
index 4e163d4..0da0fc5 100644
--- a/tasks/workstation
+++ b/tasks/workstation
@@ -7,16 +7,22 @@ Description: Debian Edu networked workstation packages
  networked workstation (thick client) installations in the Debian Edu
  Blend.
 
-Depends:     education-networked
+Depends:
+ education-networked
              skolelinux machines
 
-Depends:     education-desktop-other
+Depends:
+ education-desktop-other
 
-Recommends:  krb5-auth-dialog
+Recommends:
+ krb5-auth-dialog
 
-Suggests:    kredentials
+Suggests:
+ kredentials
 
-Recommends:  jxplorer
+Recommends:
+ jxplorer
 
-Depends:     gosa-desktop
+Depends:
+ 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