[debian-edu-commits] debian-edu/ 01/01: Cleanup tasks files: remove no longer available packages, adjust names for some language related packages that have been renamed, and replace version number for icedtea plugin to match stretch.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Wed Apr 13 13:22:31 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 4c430047153bae4ddd28b0e3e4c91586df419f38
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Wed Apr 13 15:24:01 2016 +0200
Cleanup tasks files: remove no longer available packages, adjust names
for some language related packages that have been renamed, and replace
version number for icedtea plugin to match stretch.
---
debian/changelog | 3 +++
tasks/common | 37 +++++++++++++++----------------------
tasks/desktop-other | 44 +++++++++++++++-----------------------------
tasks/development | 5 -----
tasks/electronics | 1 -
tasks/geography | 1 -
tasks/lang-no-desktop | 4 ++--
tasks/laptop | 4 ++--
tasks/main-server | 31 -------------------------------
tasks/networked-common | 4 ++--
tasks/thin-client-server | 5 -----
11 files changed, 39 insertions(+), 100 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8b3f61f..55dfdbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ debian-edu (1.900) UNRELEASED; urgency=medium
* Replace iceweasel with firefox-esr in tasks/desktop-other, desktop-gnome
and various tasks/lang-* files. Drop non-existent package
iceweasel-gnome-support from tasks/desktop-gnome.
+ * Cleanup tasks files: remove no longer available packages, adjust names
+ for some language related packages that have been renamed, and replace
+ version number for icedtea plugin to match stretch.
-- Mike Gabriel <sunweaver at debian.org> Fri, 30 Oct 2015 16:41:35 +0100
diff --git a/tasks/common b/tasks/common
index 70b37a4..f339992 100644
--- a/tasks/common
+++ b/tasks/common
@@ -78,7 +78,7 @@ Recommends: rsync, memtest86+, deborphan, hddtemp, htop, screen, mc, \
Suggests: dpt-i2o-raidutils | raidutils | dpt-raidutil, \
cpqarrayd, arrayprobe, mpt-status, \
isag, modconf, wireshark
-Ignore: smartmontools | smartsuite, smart-notifier, recover, \
+Ignore: smartmontools | smartsuite, smart-notifier, \
rkhunter
Why: The system administrator tool box.
Responsible: Petter Reinholdtsen
@@ -145,27 +145,27 @@ Why: Allow for instant rebootes without invoking the BIOS.
Responsible: Petter Reinholdtsen
NeedConfig: No
-Ignore: apache2-mpm-worker, belocs-locales-bin, \
- bpalogin, brltty, brltty-x11, \
+Ignore: apache2-mpm-worker, \
+ brltty, brltty-x11, \
capiutils, \
- contact-lookup-applet, diveintopython, \
- espeak, gamin, gnome2-user-guide, \
- gnome-app-install, gnome-terminal, gpaint, ipppd, \
+ diveintopython, \
+ espeak, gamin, gnome-user-guide, \
+ gnome-terminal, gpaint, ipppd, \
isdnutils-base, isdnutils-xtools, jfsutils, \
language-support-en, \
- liferea-mozilla, linux-wlan-ng, mcpp, min12xxw, mouseemu, \
+ linux-wlan-ng, mcpp, min12xxw, mouseemu, \
mozilla-firefox-locale-en-gb, \
- pessulus, pppdcapiplugin, \
- python-at-spi, python-notify, \
+ pppdcapiplugin, \
+ python-notify, \
scim-gtk2-immodule, scim-modules-socket, \
- scim-modules-table, scim-tables-additional, screem, \
+ 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, xdriinfo, xfce4-terminal, xfdesktop4, \
+ wamerican, xfce4-terminal, xfdesktop4, \
xfsprogs, xkeyboard-config, xmessage, xpmutils
Why: Include packages found in Edubuntu on the DVD, until we know if
we want to install them as part of some task.
@@ -173,16 +173,16 @@ Responsible: Petter Reinholdtsen
NeedConfig: ?
Ignore: tofrodos, gocr, quota, cervisia, \
- gphoto2, kcpuload, kompare, pwgen
+ gphoto2, kompare, pwgen
Why: Include much used packages on the DVD, until we know if
we want to install them as part of some task.
Responsible: Petter Reinholdtsen
NeedConfig: ?
-Ignore: dc, doc-debian, doc-linux-text, iamerican, ibritish, ispell, \
+Ignore: dc, doc-debian, iamerican, ibritish, ispell, \
mpack, mutt, python-newt, \
- tcsh, texinfo, time, w3m, akregator, apmd, arts, \
- artsbuilder, blinken, cdparanoia, edict
+ tcsh, texinfo, time, w3m, akregator, apmd, \
+ blinken, cdparanoia, edict
Why: Include packages installed by the Debian/Etch Laptop + KDE
desktop tasks, until we know if we want to install them
as part of some task.
@@ -313,13 +313,6 @@ Why: Make bash behave like it does in a normal Debian installation.
Responsible: Petter Reinholdtsen
NeedConfig: no
-Avoid: sun-java5-bin, sun-java5-jre, sun-java5-plugin
-Why: Avoid some non-free pakcages on the CD and DVD where the
- license do not allow us to distribute and install them automatically.
- See http://bugs.skolelinux.no/show_bug.cgi?id=1138
-Responsible: Petter Reinholdtsen
-NeedConfig: No
-
Depends: cifs-utils
Why: Tools needed to mount SMB file systems
Responsible: Petter Reinholdtsen
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 917ed81..4a24ace 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -68,7 +68,6 @@ Ignore: libreoffice-help-cs, \
libreoffice-help-en-gb, \
libreoffice-help-en-us, \
libreoffice-help-et, \
- libreoffice-help-hi-in, \
libreoffice-help-hu, \
libreoffice-help-it, \
libreoffice-help-km, \
@@ -79,8 +78,6 @@ Ignore: libreoffice-help-cs, \
libreoffice-help-sl, \
libreoffice-help-zh-cn, \
libreoffice-l10n-af, \
- libreoffice-l10n-as-in, \
- libreoffice-l10n-be-by, \
libreoffice-l10n-bg, \
libreoffice-l10n-bn, \
libreoffice-l10n-br, \
@@ -95,10 +92,8 @@ Ignore: libreoffice-help-cs, \
libreoffice-l10n-fi, \
libreoffice-l10n-fr, \
libreoffice-l10n-ga, \
- libreoffice-l10n-gu-in, \
libreoffice-l10n-he, \
libreoffice-l10n-hi, \
- libreoffice-l10n-hi-in, \
libreoffice-l10n-hr, \
libreoffice-l10n-hu, \
libreoffice-l10n-in, \
@@ -107,15 +102,11 @@ Ignore: libreoffice-help-cs, \
libreoffice-l10n-km, \
libreoffice-l10n-ko, \
libreoffice-l10n-ku, \
- libreoffice-l10n-lo, \
libreoffice-l10n-lt, \
libreoffice-l10n-lv, \
libreoffice-l10n-mk, \
- libreoffice-l10n-ml-in, \
libreoffice-l10n-ne, \
libreoffice-l10n-nr, \
- libreoffice-l10n-ns, \
- libreoffice-l10n-or-in, \
libreoffice-l10n-pa-in, \
libreoffice-l10n-pl, \
libreoffice-l10n-pt, \
@@ -123,11 +114,8 @@ Ignore: libreoffice-help-cs, \
libreoffice-l10n-rw, \
libreoffice-l10n-sk, \
libreoffice-l10n-sl, \
- libreoffice-l10n-sr-cs, \
libreoffice-l10n-ss, \
libreoffice-l10n-st, \
- libreoffice-l10n-ta-in, \
- libreoffice-l10n-te-in, \
libreoffice-l10n-tg, \
libreoffice-l10n-th, \
libreoffice-l10n-tn, \
@@ -252,8 +240,7 @@ Why: Several web pages uses Macromedia Flash. Recommend the
Responsible: Petter Reinholdtsen
NeedConfig: no
-Recommends: default-jre, icedtea-7-plugin
-Ignore: sun-java6-jre, sun-java6-plugin
+Recommends: default-jre, icedtea-8-plugin
Why: We need a Java run-time environment, but possibly no
development tools in the standard installation. Info om
Debian and Java is available from
@@ -326,8 +313,7 @@ Why: Various tv/video players and recorders.
Responsible: Petter Reinholdtsen
NeedConfig: ?
-Ignore: clamav, clamav-docs, clamav-freshclam, clamav-data, \
- clamav-getfiles
+Ignore: clamav, clamav-docs, clamav-freshclam, clamav-data
Why: Include free virus scanner on the CD
Responsible: ?
NeedConfig: ?
@@ -436,8 +422,8 @@ NeedConfig: no
Depends: inkscape
Recommends: gimp, gimp-data-extras, gimp-ufraw
Suggests: kolourpaint, kpaint, netpbm, gv, dia
-Ignore: gimp-help-cs, gimp-help-de, gimp-help-en, gimp-help-fr, \
- gimp-help-it, gimp-help-nl, gimp-help-sv, gimp-help-zh-cn
+Ignore: gimp-help-de, gimp-help-en, gimp-help-fr, \
+ gimp-help-it, gimp-help-nl, gimp-help-sv
Why: Drawing/sketching programs
Responsible: ?
NeedConfig: ?
@@ -510,7 +496,7 @@ Why: Math game for children
Responsible: José L. Redrejo Rodríguez
NeedConfig: no
-Ignore: ttf-mscorefonts-installer | msttcorefonts
+Ignore: ttf-mscorefonts-installer
Why: Make it easier to fetch fonts from microsoft by providing
the installation package on the DVD. We provide
fonts-liberation which is a free software alternative to
@@ -519,7 +505,7 @@ Responsible: Petter Reinholdtsen
NeedConfig: no
Ignore: nvidia-settings, dosemu, \
- kmessedwords, karamba, gs, freenx, nxclient, nxdesktop
+ kmessedwords, gs,
Why: Make sure a few popular packages are included on the DVD.
Responsible: Petter Reinholdtsen
NeedConfig: no
@@ -602,22 +588,22 @@ Why: Tools useful when creating a whiteboard using a Wii remote.
Responsible: Petter Reinholdtsen
NeedConfig: No
-Ignore: kde-l10n-af, kde-l10n-ar, kde-l10n-az, kde-l10n-bg, \
- kde-l10n-bn, kde-l10n-br, kde-l10n-bs, kde-l10n-ca, \
- kde-l10n-cs, kde-l10n-cy, kde-l10n-da, kde-l10n-de, \
+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-fy, kde-l10n-ga, kde-l10n-gl, \
+ 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-mn, kde-l10n-ms, kde-l10n-nb, kde-l10n-nds, \
+ 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-rw, kde-l10n-se, kde-l10n-sk, kde-l10n-sl, \
- kde-l10n-sr, kde-l10n-srlatin, kde-l10n-ss, \
- kde-l10n-ta, kde-l10n-tg, kde-l10n-tr, kde-l10n-uk, \
- kde-l10n-uz, kde-l10n-zhcn, kde-l10n-zhtw
+ kde-l10n-se, kde-l10n-sk, kde-l10n-sl, \
+ kde-l10n-sr, \
+ kde-l10n-tr, kde-l10n-uk, \
+ kde-l10n-zhcn, kde-l10n-zhtw
Why: Pad the last CD using KDE translations, to avoid
noise in the package reports.
Responsible: Petter Reinholdtsen
diff --git a/tasks/development b/tasks/development
index 06da8a4..f38940c 100644
--- a/tasks/development
+++ b/tasks/development
@@ -21,11 +21,6 @@ Depends: quanta
Note: this dependency is just contained in desktop-other, but it might be
worth mentioning here
-Ignore: sun-java6-bin, sun-java6-demo, sun-java6-fonts, sun-java6-jdk, sun-java6-jre,
- sun-java6-plugin, sun-java6-source
-Note: While Java6 is in non-free it is definitely useful for software development
- in schools and should be on our radar in any case.
-
Suggests: eclipse
Note: 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
diff --git a/tasks/electronics b/tasks/electronics
index 3454679..e5d999f 100644
--- a/tasks/electronics
+++ b/tasks/electronics
@@ -10,7 +10,6 @@ Depends: qucs, gpsim, oregano
Recommends: education-menus, xoscope
Suggests: kicad, kicad-doc-en, kicad-doc-de, kicad-doc-es, kicad-doc-fr
Suggests: electric, pcb, xcircuit, freehdl, gtkwave
-Ignore: eagle
Responsible: ?
NeedConfig: no
diff --git a/tasks/geography b/tasks/geography
index 6e26ba3..aa8c49e 100644
--- a/tasks/geography
+++ b/tasks/geography
@@ -12,7 +12,6 @@ Suggests: gpscorrelate, qlandkartegt, viking, googleearth-package, \
mapserver-bin, openscenegraph, grass, qgis, gmt, \
thuban, earth3d
Ignore: drawmap, gdal-bin, libgeo-coordinates-utm-perl, \
- libgeography-nationalgrid-perl, \
libgeo-helmerttransform-perl, libgeo-metar-perl, \
libgeo-postcode-perl, libgeos-c1, ogdi-bin, \
qgis-plugin-grass, postgis, proj, \
diff --git a/tasks/lang-no-desktop b/tasks/lang-no-desktop
index 070933c..ba79447 100644
--- a/tasks/lang-no-desktop
+++ b/tasks/lang-no-desktop
@@ -12,7 +12,7 @@ Why: Norwegian packages for gcompris. nn sound is missing
Responsible: ?
NeedConfig: no
-Recommends: gimp-help-no
+Recommends: gimp-help-nn
Why: Provide norwegian help text for gimp. gimp itself is in desktop-other.
Responsible: Petter Reinholdtsen
NeedConfig: No
@@ -31,7 +31,7 @@ Why: Provide norwegian help text for firefox-esr. firefox-esr itself is
Responsible: Petter Reinholdtsen
NeedConfig: No
-Suggests: icedove-l10n-nb, icedove-l10n-nn
+Suggests: icedove-l10n-nb-no, icedove-l10n-nn-no
Why: Provide norwegian help text for icedove. icedove itself is suggested in desktop-other.
Responsible: Petter Reinholdtsen
NeedConfig: No
diff --git a/tasks/laptop b/tasks/laptop
index af87587..e28c1c2 100644
--- a/tasks/laptop
+++ b/tasks/laptop
@@ -30,8 +30,8 @@ Responsible: Petter Reinholdtsen
NeedConfig: no
Recommends: kde-config-touchpad
-Ignore: laptop-net, laptop-net-doc, laptop-netconf, \
- battery-stats, hdaps-utils, hdapsd, fnfxd
+Ignore: laptop-net, \
+ battery-stats, hdapsd, fnfxd
Why: Laptop specific packages proposed by Ralf Gesellensetter
Responsible: ?
NeedConfig: ?
diff --git a/tasks/main-server b/tasks/main-server
index 866a6eb..911ed8d 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -132,17 +132,6 @@ Responsible: Ragnar Wisloff
NeedConfig: Should not need that, no
Suggests: nagios3-doc
-Ignore: moodle-debian-edu-theme
-Why: Nice skolelinux theme for moodle
-Responsible: Xavier Oswald
-NeedConfig: no
-
-Ignore: moodle-courses-fr
-Why: French skolelinux documents for moodle. Contain the
- initial database dump.
-Responsible: Xavier Oswald
-NeedConfig: no
-
Suggests: debian-edu-fr-all
Why: Software and tools needed by the french schools (metapackage)
Responsible: Xavier Oswald
@@ -153,31 +142,11 @@ Why: Users skels for French students
Responsible: Xavier Oswald
NeedConfig: no
-Ignore: moodle-cipux
-Why: Tool to administrate the user LDAP database (php tool)
-Responsible: Xavier Oswald
-NeedConfig: Yes, need to set the LDAP database with the cipux fields
-
-Ignore: cipux-common
-Why: The common base for CiBot, CAT: ldap schema, system.conf
-Responsible: Christian Kuelker
-NeedConfig: no
-
-Ignore: cipux-cibot
-Why: The ldap abstraction layer of cipux
-Responsible: Christian Kuelker
-NeedConfig: no
-
Ignore: cipux-rpcd
Why: XML-RPC daemon of CipUX::Task API for CipUX
Responsible: Christian Kuelker
NeedConfig: no
-Ignore: cipux-profile
-Why: Provides scripts for various CipUX installations
-Responsible: Christian Kuelker
-NeedConfig: no
-
Depends: sitesummary
Suggests: ocsinventory-server, ocsinventory-reports, mysql-client
Why: Keep track of all the machines in the skolelinux network
diff --git a/tasks/networked-common b/tasks/networked-common
index ba85156..66d529e 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -14,7 +14,7 @@ Why: Need the common packages on all networked installations.
Responsible: Petter Reinholdtsen
NeedConfig: no
-Depends: libnss-ldapd, nslcd, libldap2-tls
+Depends: libnss-ldapd, nslcd
Why: Access list of users, groups etc from LDAP server
Responsible: ? (someone need to check the package list is complete)
NeedConfig: yes - set LDAP server to name of server
@@ -93,7 +93,7 @@ Responsible: Petter Reinholdtsen
NeedConfig: Yes
Depends: openssh-server
-Suggests: denyhosts, fail2ban
+Suggests: fail2ban
Avoid: ssh-askpass
Why: Allow remote login and administration.
Responsible: Petter Reinholdtsen
diff --git a/tasks/thin-client-server b/tasks/thin-client-server
index 9434c9d..24ec454 100644
--- a/tasks/thin-client-server
+++ b/tasks/thin-client-server
@@ -25,11 +25,6 @@ Why: LTSP needs tftpd, but the core LTSP package lists it as
Responsible: Ragnar WislÞff
Needconfig: yes
-Ignore: netboot
-Why: We use ltsp boot images
-Responsible: Ragnar WislÞff
-Needconfig: ?
-
Depends: ltsp-server-standalone, ltspfs
Why: Debian package based LTSP server for diskless and thin clients.
Responsible: Petter Reinholdtsen
--
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