[debian-edu-commits] debian-edu/ 01/01: typo fixes; update after 'make dist' run.

Mon Apr 18 20:43:21 UTC 2016

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

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

commit 6197e822bc05efaffbd26fda7f88bd79256fe6aa
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Apr 18 22:44:43 2016 +0200

    typo fixes; update after 'make dist' run.
---
 debian-edu-tasks.desc | 22 ++++++------
 debian/control        | 92 +++------------------------------------------------
 tasks/common          |  4 +--
 3 files changed, 18 insertions(+), 100 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 2ba44c0..37369d4 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -66,6 +66,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -180,6 +181,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -244,8 +246,6 @@ Packages: list
  kaddressbook-plugins
  kdepim-groupware
  digikamimageplugins
- kdenetwork-kfile-plugins
- kiosktool
  bluedevil
  kwalletmanager
  virtuoso-minimal
@@ -253,7 +253,6 @@ Packages: list
  printer-applet
  freespacenotifier
  update-notifier-kde
- quanta
  krfb
  krdc
  kde-l10n-es
@@ -338,6 +337,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -456,6 +456,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -561,7 +562,6 @@ Packages: list
  libreoffice-help-pt-br
  openclipart-libreoffice
  openclipart
- libreoffice-help-en
  browser-plugin-libreoffice
  gstreamer0.10-alsa
  gstreamer0.10-esd
@@ -782,6 +782,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -987,7 +988,6 @@ Packages: list
  hspell
  myspell-he
  libreoffice-l10n-he
- libreoffice-help-he
  firefox-esr-l10n-he
 
 Task: education-lang-he-desktop-kde
@@ -1091,8 +1091,6 @@ Packages: list
  gimp-help-nn
  libreoffice-l10n-nb
  libreoffice-l10n-nn
- libreoffice-help-nb
- libreoffice-help-nn
  firefox-esr-l10n-nb-no
  firefox-esr-l10n-nn-no
 
@@ -1240,6 +1238,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -1414,6 +1413,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -1533,6 +1533,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -1630,7 +1631,6 @@ Packages: list
  libreoffice-help-pt-br
  openclipart-libreoffice
  openclipart
- libreoffice-help-en
  browser-plugin-libreoffice
  gstreamer0.10-alsa
  gstreamer0.10-esd
@@ -1855,6 +1855,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -1934,7 +1935,6 @@ Packages: list
  libreoffice-help-pt-br
  openclipart-libreoffice
  openclipart
- libreoffice-help-en
  browser-plugin-libreoffice
  gstreamer0.10-alsa
  gstreamer0.10-esd
@@ -2186,6 +2186,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -2287,7 +2288,6 @@ Packages: list
  libreoffice-help-pt-br
  openclipart-libreoffice
  openclipart
- libreoffice-help-en
  browser-plugin-libreoffice
  gstreamer0.10-alsa
  gstreamer0.10-esd
@@ -2520,6 +2520,7 @@ Packages: list
  foomatic-db
  foomatic-db-engine
  foomatic-db-gutenprint
+ cups-filters
  cups-browsed
  printer-driver-pnm2ppa
  printer-driver-hpijs
@@ -2621,7 +2622,6 @@ Packages: list
  libreoffice-help-pt-br
  openclipart-libreoffice
  openclipart
- libreoffice-help-en
  browser-plugin-libreoffice
  gstreamer0.10-alsa
  gstreamer0.10-esd
diff --git a/debian/control b/debian/control
index 6ca88b4..a8c76f2 100644
--- a/debian/control
+++ b/debian/control
@@ -93,6 +93,7 @@ Recommends: apt-listchanges,
  cpufrequtils,
  cups,
  cups-browsed,
+ cups-filters | foomatic-filters,
  debconf-utils,
  debian-archive-keyring,
  debian-edu-archive-keyring,
@@ -169,19 +170,15 @@ Recommends: apt-listchanges,
 Suggests: apticron | cron-apt,
  arrayprobe,
  cpqarrayd,
- cups-filters (>= 1.0.42-1),
- cupsomatic-ppd,
  debian-goodies,
  debsecan,
  dpt-i2o-raidutils | raidutils,
- dpt-raidutil,
  emacs,
  firmware-bnx2,
  firmware-ipw2x00,
  firmware-iwlwifi,
  firmware-qlogic,
  foo2zjs,
- foomatic-filters (<= 4.0.17-1),
  ident-server,
  isag,
  kexec-tools,
@@ -219,7 +216,6 @@ Recommends: education-common,
  synaptic,
  totem | dragonplayer | vlc | xine-ui
 Suggests: dasher,
- gnochm,
  gnome-accessibility-themes,
  gnome-mag,
  gnome-orca,
@@ -293,38 +289,22 @@ Suggests: digikamimageplugins,
  freespacenotifier,
  kaddressbook-plugins,
  kaffeine,
- kate-plugins,
  kcron,
  kde,
  kde-full,
  kde-l10n-se,
- kdeaddons-kfile-plugins,
  kdebase,
- kdenetwork-kfile-plugins,
  kdepim-groupware,
- kdepim-kfile-plugins,
- kedit,
  kfilereplace,
  kfind,
- kiconedit,
- kiosktool,
- kmid,
- kmidi,
  knode,
- kpaint,
- kpm,
- krecord,
  kruler,
  kscd,
  kschoolmenu,
  kscreensaver,
  kuser,
- kview,
  mplayer2,
- noatun,
- noatun-plugins,
  printer-applet,
- quanta,
  update-notifier-kde,
  x-display-manager
 Description: Debian Edu KDE desktop applications
@@ -385,7 +365,6 @@ Recommends: education-common,
  synaptic,
  vlc | xine-ui | totem | dragonplayer
 Suggests: dasher,
- gnochm,
  gstreamer0.10-ffmpeg,
  kaffeine,
  libreoffice-filter-binfilter,
@@ -509,16 +488,12 @@ Recommends: alsa-base,
  xserver-xorg-input-all,
  xserver-xorg-video-all,
  zip
-Suggests: adept,
- atlantik,
- atlantikdesigner,
- auctex,
+Suggests: auctex,
  avahi-autoipd,
  avahi-discover,
  browser-plugin-gnash,
  browser-plugin-libreoffice,
  controlaula,
- dbdesigner,
  dhcp3-client,
  dia,
  fet,
@@ -528,42 +503,30 @@ Suggests: adept,
  firefox-esr-l10n-bg,
  firefox-esr-l10n-ca,
  firefox-esr-l10n-cs,
- firefox-esr-l10n-cy-gb,
- firefox-esr-l10n-dz-bt,
- firefox-esr-l10n-et-ee,
- firefox-esr-l10n-fa-ir,
  firefox-esr-l10n-fi,
- firefox-esr-l10n-fur-it,
  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-ka,
  firefox-esr-l10n-ko,
- firefox-esr-l10n-ku,
  firefox-esr-l10n-lt,
  firefox-esr-l10n-mk,
- firefox-esr-l10n-mn,
  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-roa-es-val,
  firefox-esr-l10n-ru,
  firefox-esr-l10n-sk,
  firefox-esr-l10n-sl,
  firefox-esr-l10n-tr,
- firefox-esr-l10n-uk-ua,
  firefox-esr-l10n-zh-cn,
  firefox-esr-l10n-zh-tw,
  flashplugin-nonfree,
- flashplugin-nonfree-pulse,
  fonts-arphic-uming,
  fonts-larabie-deco,
  fonts-mlym,
- foomatic-gui,
  gcompris-sound-cs,
  gcompris-sound-de,
  gcompris-sound-en,
@@ -609,73 +572,44 @@ Suggests: adept,
  icedove-l10n-it,
  im-switch,
  kaffeine-mozilla,
- kasteroids,
  katomic,
- kbabel,
- kbackgammon,
  kbattleship,
  kblackbox,
  kbounce,
  kchart,
- kdnssd,
  kernel-package,
- keuklid,
  kformula,
- kfouleggs,
- kgeo,
  kgoldrunner,
- kgraph,
  kig,
  kino,
- kivio,
  kjumpingcube,
- klearnspelling,
  klickety,
  klogic,
  kmahjongg,
  kmines,
- kmultiply,
- knorskverbs,
  kolf,
- kolourpaint,
  konqueror-plugin-gnash,
  konquest,
- koshell,
- kpaint,
  kpat,
- kpercentage,
- kpoker,
  kppp,
  kreversi,
  ksame,
  kshisen,
- ksirtet,
- ksmiletris,
- ksnake,
  kspaceduel,
  ktron,
- kugar,
  kuser,
- kworldclock,
  lacheck,
  libdvdcss2,
- libflashsupport,
  libncurses5-dev,
  libreoffice-filter-binfilter,
- libreoffice-filter-mobiledev,
- libreoffice-help-en,
  libreoffice-help-zh-tw,
- libreoffice-l10n-common,
- libreoffice-l10n-en-us,
  libreoffice-l10n-en-za,
  libreoffice-l10n-zh-tw,
  libreoffice-style-crystal,
- libreoffice-style-default,
  lightspeed,
  lyx,
  mdns-scan,
  monopd,
- mozilla-mplayer,
  mozilla-plugin-gnash,
  mozilla-plugin-vlc,
  myspell-en-us,
@@ -683,7 +617,6 @@ Suggests: adept,
  mythes-en-us,
  ncftp,
  netpbm,
- ogle-gui,
  openmovieeditor,
  pgdesigner,
  pitivi,
@@ -704,7 +637,6 @@ Suggests: adept,
  wget,
  wine,
  xfonts-100dpi-transcoded,
- xfonts-base-transcoded,
  xine-ui
 Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
  This metapackage depends on various office and desktop applications
@@ -768,13 +700,7 @@ Suggests: bluefish,
  gambas2,
  quanta,
  swi-prolog,
- swi-prolog-clib,
  swi-prolog-doc,
- swi-prolog-http,
- swi-prolog-semweb,
- swi-prolog-sgml,
- swi-prolog-table,
- swi-prolog-xpce,
  tcl8.5-dev,
  tk8.5-dev
 Description: Debian Edu software development related educational applications
@@ -842,8 +768,6 @@ Recommends: dia-gnome,
  xpaint
 Suggests: blender,
  hugin,
- kontour,
- panorama,
  partlibrary,
  tgif,
  xaos,
@@ -911,8 +835,7 @@ Recommends: atomix,
  lmemory,
  xboard
 Suggests: crafty,
- kdegames | gnome-games,
- ksokoban
+ kdegames | gnome-games
 Description: Debian Edu logic games
  This metapackage depends on various logic games that can be used to
  teach logic to children.
@@ -982,15 +905,13 @@ Suggests: apache2-doc,
  avahi-autoipd,
  avahi-discover,
  calamaris,
- debian-edu-fr-all,
- debian-edu-fr-skels,
  debian-installer-9-netboot-amd64,
  debian-installer-9-netboot-i386,
  dlint,
  dnswalk,
  dovecot-pop3d,
  dsh,
- kdnssd,
+ kde-zeroconf,
  krb5-doc,
  libapache2-mod-auth-kerb,
  libsasl2-modules-ldap,
@@ -1137,10 +1058,7 @@ Recommends: education-menus,
 Suggests: ejs,
  etoys,
  kturtle,
- lum,
- mek,
- pyode,
- xem,
+ python-pyode,
  xoscope
 Description: Debian Edu physics related applications
  This metapackage depends on various applications that can be used to
diff --git a/tasks/common b/tasks/common
index 2bf61db..c763bca 100644
--- a/tasks/common
+++ b/tasks/common
@@ -75,7 +75,7 @@ Depends:     bind9-host, traceroute, tcptraceroute, iftop, less, \
              mtr-tiny | mtr, fping, iotop
 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, \
@@ -297,7 +297,7 @@ Responsible: Petter Reinholdtsen
 NeedConfig:  No
 
 Depends:     cups, foomatic-db, foomatic-db-engine, foomatic-db-gutenprint, \
-             cups-filters | foomatic-filters \
+             cups-filters | foomatic-filters, \
              cups-browsed, printer-driver-pnm2ppa, \
              printer-driver-hpijs, hpijs-ppds, hplip, ijsgutenprint
 Suggests:    foo2zjs

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

