[debian-edu-commits] debian-edu/ 01/01: Remove no longer available packages from tasks files, replace some with similar or equivalent ones. Other replacements (esp. for KDE) are already pulled in via other Depends. (Closes: #726492, #782056, #792837)
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Mon Apr 18 20:30:58 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 a8b2030156e28692480634ef3030f0ac440b84a9
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Mon Apr 18 22:32:46 2016 +0200
Remove no longer available packages from tasks files, replace some with similar or equivalent ones. Other replacements (esp. for KDE) are already pulled in via other Depends. (Closes: #726492, #782056, #792837)
---
debian/changelog | 3 +++
tasks/common | 4 ++--
tasks/desktop-gnome | 2 +-
tasks/desktop-kde | 13 +++-------
tasks/desktop-mate | 2 +-
tasks/desktop-other | 60 +++++++++++++----------------------------------
tasks/development | 3 +--
tasks/graphics | 2 +-
tasks/lang-he-desktop | 3 +--
tasks/lang-no-desktop | 4 +---
tasks/lang-se-desktop-kde | 12 ----------
tasks/logic-games | 2 +-
tasks/main-server | 12 +---------
tasks/networked-common | 2 +-
tasks/physics | 2 +-
15 files changed, 34 insertions(+), 92 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 75799ae..3e54ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ debian-edu (1.900) UNRELEASED; urgency=medium
* Replace myspell-de-* with hunspell-de-* in tasks/lang-de and tasks/
desktop-other. Thanks to Roland Rosenfeld. (Closes: #813834)
* Add ltsp-docs as a Depends: to tasks/thin-client-server. (Closes: #781039)
+ * Remove no longer available packages from tasks files, replace some with
+ similar or equivalent ones. Other replacements (esp. for KDE) are
+ already pulled in via other Depends. (Closes: #726492, #782056, #792837)
-- Mike Gabriel <sunweaver at debian.org> Fri, 30 Oct 2015 16:41:35 +0100
diff --git a/tasks/common b/tasks/common
index f339992..2bf61db 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 | dpt-raidutil, \
+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 (>= 1.0.42-1) | foomatic-filters (<= 4.0.17-1) | cupsomatic-ppd, \
+ cups-filters | foomatic-filters \
cups-browsed, printer-driver-pnm2ppa, \
printer-driver-hpijs, hpijs-ppds, hplip, ijsgutenprint
Suggests: foo2zjs
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index 983abcf..67bd953 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -14,7 +14,7 @@ NeedConfig: no
Depends: gdm3 | x-display-manager, \
gnome, gimp, \
- inkscape, gnochm, gstreamer0.10-ffmpeg, \
+ inkscape, gstreamer0.10-ffmpeg, \
gstreamer0.10-pulseaudio, synaptic
Suggests: dasher, gnome-mag, gok, \
gnome-accessibility-themes, gnome-orca
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index db107e2..18fd10d 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -22,12 +22,10 @@ Recommends: kcalc, ark, kmail, kaddressbook, kcharselect, \
kfloppy, knotes, clementine, \
kdewallpapers, kdeutils, kamera, digikam, digikamimageplugins, \
kipi-plugins, \
- kdenetwork-kfile-plugins, kdeaccessibility, kiosktool, \
+ kdeaccessibility, \
kturtle
-Suggests: knode, kcron, kuser, kscd, krecord, kfind, kview, \
- kpaint, kedit, kate-plugins, noatun, noatun-plugins, \
- kmid, kmidi, kruler, kfilereplace, kiconedit, kpm, \
- kdepim-kfile-plugins, kdeaddons-kfile-plugins, \
+Suggests: knode, kcron, kuser, kscd, kfind, \
+ kruler, kfilereplace, \
kde | kde-full
Why: KDE desktop environment
Responsible: ? (someone need to check the package list is complete)
@@ -57,11 +55,6 @@ Why: KDE 4 desktop environment. List the new packages here.
Responsible: ?
NeedConfig: ?
-Recommends: quanta
-Why: HTML editor ++
-Responsible: ?
-NeedConfig: no
-
Recommends: krfb, krdc
Why: KDE remote desktop packages
Responsible: Petter Reinholdtsen
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index 31a4c75..8fef4a1 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -15,7 +15,7 @@ NeedConfig: no
Depends: lightdm | x-display-manager, \
mate-desktop-environment, mate-desktop-environment-extras, \
mate-settings-daemon-pulse, mate-media-pulse, \
- gimp, inkscape, gnochm, gstreamer0.10-ffmpeg, \
+ gimp, inkscape, gstreamer0.10-ffmpeg, \
synaptic
Suggests: dasher
Avoid: xdm
diff --git a/tasks/desktop-other b/tasks/desktop-other
index cfc4a3d..fdabe45 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -11,7 +11,7 @@ Note: Some packages might be listed several times. If you are
Depends: xorg, xserver-xorg-input-all, xserver-xorg-video-all, libgl1-mesa-dri, \
numlockx, unifont, gsfonts-x11, \
- xfonts-base-transcoded, xfonts-75dpi-transcoded, \
+ xfonts-75dpi-transcoded, \
fonts-mgopen, fonts-freefont-ttf, fonts-liberation, fonts-linex
Suggests: xfonts-100dpi-transcoded, fonts-mlym
Why: X11 Window system
@@ -23,7 +23,7 @@ Why: Nice font, but in non-free.
Responsible: Petter Reinholdtsen
NeedConfig: no
-Depends: synaptic | adept
+Depends: synaptic
Ignore: kpackage
Why: Need a userfriendly debian package manager
Responsible: Petter Reinholdtsen
@@ -44,7 +44,6 @@ Recommends: libreoffice-l10n-el, \
libreoffice-l10n-nl, \
libreoffice-l10n-sv, \
libreoffice-l10n-pt-br, \
- libreoffice-help-en, \
libreoffice-help-el, \
libreoffice-help-fr, \
libreoffice-help-es, \
@@ -53,14 +52,10 @@ Recommends: libreoffice-l10n-el, \
browser-plugin-libreoffice, \
openclipart-libreoffice, openclipart
Suggests: libreoffice-filter-binfilter, \
- libreoffice-filter-mobiledev, \
- libreoffice-l10n-common, \
- libreoffice-l10n-en-us, \
libreoffice-l10n-en-za, \
libreoffice-help-zh-tw, \
libreoffice-l10n-zh-tw, \
libreoffice-style-crystal, \
- libreoffice-style-default, \
mythes-en-us
Ignore: libreoffice-help-cs, \
libreoffice-help-de, \
@@ -156,34 +151,24 @@ Suggests: firefox-esr-l10n-af, \
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
Why: Very nice browser. Recommend the most used language packages,
@@ -197,7 +182,7 @@ Why: Useful browser where firefox-esr or konqueror fail to properly
Responsible: ?
Needconfig: ?
-Depends: gecko-mediaplayer | mozilla-mplayer | kaffeine-mozilla | mozilla-plugin-vlc
+Depends: gecko-mediaplayer | kaffeine-mozilla | mozilla-plugin-vlc
Why: Iceweasel should have video and audio support. Include a useful
firefox plugin for this.
Responsible: ?
@@ -227,7 +212,7 @@ NeedConfig: ?
Depends: konqueror-plugin-gnash, browser-plugin-gnash | mozilla-plugin-gnash
Recommends: gstreamer0.10-fluendo-mp3, \
gstreamer0.10-audiosink
-Suggests: flashplugin-nonfree, flashplugin-nonfree-pulse | libflashsupport
+Suggests: flashplugin-nonfree
Ignore: browser-plugin-lightspark
Avoid: flashplugin-nonfree
Why: Several web pages uses Macromedia Flash. Recommend the
@@ -261,14 +246,13 @@ Responsible: ?
NeedConfig: ?
Depends: avahi-daemon, libnss-mdns
-Suggests: avahi-discover, mdns-scan, avahi-autoipd, kdnssd
+Suggests: avahi-discover, mdns-scan, avahi-autoipd
Why: Packages needed for dynamic service location and
network configuration.
Responsible: Petter Reinholdtsen
NeedConfig: ?
Depends: cups-client, cups-bsd
-Suggests: foomatic-gui
Why: CUPS printer system. This is the client part
Responsible: ?
NeedConfig: ?
@@ -308,7 +292,7 @@ NeedConfig: no
Depends: openshot, kdenlive, stopmotion
Recommends: vgrabbj, dvgrab, libav-tools
-Suggests: kino, pitivi, xine-ui, libdvdcss2, ogle-gui, openmovieeditor
+Suggests: kino, pitivi, xine-ui, libdvdcss2, openmovieeditor
Why: Various tv/video players and recorders.
Responsible: Petter Reinholdtsen
NeedConfig: ?
@@ -356,24 +340,12 @@ Why: Filoverfører
Responsible: ?
NeedConfig: ?
-Suggests: pgdesigner, dbdesigner
+Suggests: pgdesigner
Why: Database
Responsible: ?
NeedConfig: ?
-
-
-Note: ENKELTE FAG
- # NB! Dette hører sammen med ovenstående pakke
-Suggests: kig | keuklid | kgeo, kgraph, kmultiply, klearnspelling, kpercentage
-Why: matematikk (spisekart). kgeo, kpercentage and klearspelling are
- part of kdeedu.
-Responsible: ?
-NeedConfig: ?
-
-
-Suggests: knorskverbs
-Why: Norskundervisning. knorskverbs is part of kdeedu.
+Suggests: kig
Responsible: ?
NeedConfig: ?
@@ -414,14 +386,14 @@ Why: GUI frontend to LaTeX makes it easier to use for new users.
Responsible: ?
NeedConfig: ?
-Suggests: kchart, kformula, koshell, kugar, kivio
+Suggests: kchart, kformula
Why: leftovers
Responsible: ?
NeedConfig: no
Depends: inkscape
Recommends: gimp, gimp-data-extras, gimp-ufraw
-Suggests: kolourpaint, kpaint, netpbm, gv, dia
+Suggests: netpbm, gv, dia
Ignore: gimp-help-de, gimp-help-en, gimp-help-fr, \
gimp-help-it, gimp-help-nl, gimp-help-sv
Why: Drawing/sketching programs
@@ -521,7 +493,7 @@ Why: Virtual PC useful for testing.
Responsible: Petter Reinholdtsen
NeedConfig: No
-Suggests: atlantik, atlantikdesigner, monopd
+Suggests: monopd
Why: Nice client/server board game.
Responsible: Petter Reinholdtsen
NeedConfig: No
@@ -542,10 +514,10 @@ Responsible: Petter Reinholdtsen
NeedConfig: No
-Suggests: ksnake, kasteroids, ktron, kpat, ksmiletris, kbattleship, \
- ksirtet, ksame, kbounce, kpoker, kworldclock, kspaceduel, \
- kgoldrunner, kfouleggs, kolf, kmines, konquest, kshisen, \
- katomic, klickety, kblackbox, kjumpingcube, kbackgammon, \
+Suggests: ktron, kpat, kbattleship, \
+ ksame, kbounce, kspaceduel, \
+ kgoldrunner, kolf, kmines, konquest, kshisen, \
+ katomic, klickety, kblackbox, kjumpingcube, \
kmahjongg, kreversi
Ignore: kdegames
Why: Make some much used games available in the default
@@ -567,7 +539,7 @@ Why: Run MS Windows applications.
Responsible: ?
NeedConfig: ?
-Suggests: kbabel, gettext
+Suggests: gettext
Why: Include the tools we need in the Skolelinux project.
Responsible: Petter Reinholdtsen
NeedConfig: ?
diff --git a/tasks/development b/tasks/development
index f38940c..19731f5 100644
--- a/tasks/development
+++ b/tasks/development
@@ -34,8 +34,7 @@ Depends: kommander
Suggests: tk8.5-dev, tcl8.5-dev
-Suggests: swi-prolog, swi-prolog-clib, swi-prolog-http, swi-prolog-semweb, \
- swi-prolog-sgml, swi-prolog-table, swi-prolog-xpce, swi-prolog-doc
+Suggests: swi-prolog, swi-prolog-doc
Depends: squeak-vm
diff --git a/tasks/graphics b/tasks/graphics
index 02343af..b01b8bf 100644
--- a/tasks/graphics
+++ b/tasks/graphics
@@ -8,7 +8,7 @@ Description: Debian Edu graphics related applications
Depends: inkscape, gimp, librecad, dia-gnome
Recommends: education-menus, xpaint, partlibrary
-Suggests: xfig, kontour, xaos, panorama, tgif, hugin, blender
+Suggests: xfig, xaos, tgif, hugin, blender
Ignore: dcraw
Depends: scribus
diff --git a/tasks/lang-he-desktop b/tasks/lang-he-desktop
index 738bf7c..d934cc6 100644
--- a/tasks/lang-he-desktop
+++ b/tasks/lang-he-desktop
@@ -12,8 +12,7 @@ Why: Hebrew support
Responsible: Lior Kaplan
NeedConfig: no
-Recommends: libreoffice-l10n-he, \
- libreoffice-help-he
+Recommends: libreoffice-l10n-he
Why: Provide Hebrew help text for libreoffice. libreoffice itself is in desktop-other.
Responsible: ?
NeedConfig: No
diff --git a/tasks/lang-no-desktop b/tasks/lang-no-desktop
index ba79447..9980461 100644
--- a/tasks/lang-no-desktop
+++ b/tasks/lang-no-desktop
@@ -18,9 +18,7 @@ Responsible: Petter Reinholdtsen
NeedConfig: No
Recommends: libreoffice-l10n-nb, \
- libreoffice-l10n-nn, \
- libreoffice-help-nb, \
- libreoffice-help-nn
+ libreoffice-l10n-nn
Why: Provide norwegian help text for libreoffice. libreoffice itself is in desktop-other.
Responsible: Petter Reinholdtsen
NeedConfig: No
diff --git a/tasks/lang-se-desktop-kde b/tasks/lang-se-desktop-kde
index 4162812..e69de29 100644
--- a/tasks/lang-se-desktop-kde
+++ b/tasks/lang-se-desktop-kde
@@ -1,12 +0,0 @@
-Task: Norwegian KDE Desktop
-Section: metapackages
-Metapackage: false
-Enhances: education-desktop-kde, education-lang-se
-Architecture: any
-Description: North Sami Debian Edu KDE desktop applications
- This task provide files to localises the KDE desktop in North Sami.
-
-Recommends: kde-l10n-se
-Why: KDE desktop translations for relevant languages.
-Responsible: ? (someone need to check the package list is complete)
-NeedConfig: no
diff --git a/tasks/logic-games b/tasks/logic-games
index 5b3e415..e335306 100644
--- a/tasks/logic-games
+++ b/tasks/logic-games
@@ -6,6 +6,6 @@ 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, ksokoban
+Depends: atomix, blinken, cgoban, lmemory, gnuchess, xboard, cgoban, gnugo, gtans
Recommends: education-menus
Suggests: crafty, kdegames | gnome-games
diff --git a/tasks/main-server b/tasks/main-server
index e866396..dd6e2fe 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -19,7 +19,7 @@ Responsible: Lars Bahner
NeedConfig: yes - set up default firewall rules
Depends: avahi-daemon, libnss-mdns
-Suggests: avahi-discover, mdns-scan, avahi-autoipd, kdnssd
+Suggests: avahi-discover, mdns-scan, avahi-autoipd, kde-zeroconf
Why: Packages needed for dynamic service location, network
configuration and print server discovery
Responsible: Mike Gabriel
@@ -132,16 +132,6 @@ Responsible: Ragnar Wisloff
NeedConfig: Should not need that, no
Suggests: nagios3-doc
-Suggests: debian-edu-fr-all
-Why: Software and tools needed by the french schools (metapackage)
-Responsible: Xavier Oswald
-NeedConfig: no
-
-Suggests: debian-edu-fr-skels
-Why: Users skels for French students
-Responsible: Xavier Oswald
-NeedConfig: no
-
Ignore: cipux-rpcd
Why: XML-RPC daemon of CipUX::Task API for CipUX
Responsible: Christian Kuelker
diff --git a/tasks/networked-common b/tasks/networked-common
index 66d529e..01fdfd5 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -57,7 +57,7 @@ Why: Enable Kerberos authentication and make GSSAPI available.
Responsible: Petter Reinholdtsen
NeedConfig: No - realm and KDC server are configured on the main-server.
-Suggests: smbfs, libpam-mount
+Suggests: cifs, libpam-mount
Why: Tools to mount windows shares when users log in.
Responsible: ?
NeedConfig: ?
diff --git a/tasks/physics b/tasks/physics
index af4cdac..ab97a48 100644
--- a/tasks/physics
+++ b/tasks/physics
@@ -8,7 +8,7 @@ Description: Debian Edu physics related applications
Depends: planets, step
Recommends: education-menus
-Suggests: pyode, etoys, mek, xem, lum, xoscope, kturtle
+Suggests: python-pyode, etoys, xoscope, kturtle
Suggests: ejs
Homepage: http://www.um.es/fem/Ejs/
--
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