[debian-edu-commits] debian-edu/ 13/18: Fix 53f8672e. The Why: field had multi-lines at various places. Removing them with this commit, too.
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 3d705ec25ec4eec6a73f5e0518bedb5574798ae5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Aug 4 17:29:17 2017 -0400
Fix 53f8672e. The Why: field had multi-lines at various places. Removing them with this commit, too.
---
tasks/astronomy | 1 -
tasks/common | 26 --------------------------
tasks/desktop-gnome | 1 -
tasks/desktop-kde | 3 ---
tasks/desktop-lxde | 4 ----
tasks/desktop-mate | 1 -
tasks/desktop-other | 27 ---------------------------
tasks/desktop-xfce | 5 -----
tasks/graphics | 1 -
tasks/lang-da-desktop | 3 ---
tasks/lang-fr-desktop | 1 -
tasks/lang-ja-desktop | 2 --
tasks/laptop | 1 -
tasks/ltsp-server | 2 --
tasks/main-server | 11 -----------
tasks/music | 2 --
tasks/networked | 2 --
tasks/networked-common | 4 ----
tasks/roaming-workstation | 4 ----
tasks/standalone | 2 --
tasks/thin-client | 1 -
tasks/workstation | 5 -----
22 files changed, 109 deletions(-)
diff --git a/tasks/astronomy b/tasks/astronomy
index d869182..a5f781f 100644
--- a/tasks/astronomy
+++ b/tasks/astronomy
@@ -7,7 +7,6 @@ Description: Debian Edu astronomy related applications
teach astronomy.
Depends: celestia-gnome | celestia-glut | celestia
- put the dummy package celestia last.
Depends: gpredict, stellarium, xplanet, xplanet-images, kstars
Recommends: education-menus
diff --git a/tasks/common b/tasks/common
index 2b6e41f..7ead552 100644
--- a/tasks/common
+++ b/tasks/common
@@ -7,7 +7,6 @@ Description: Debian Edu common packages
installations in the Debian Edu Blend.
Depends: rsyslog
- than can be configured for network logging.
NeedConfig: yes - Todo
Suggests: rsyslog-doc
DontAvoid: sysklogd (can't avoid this one yet, debootstrap lists it as required)
@@ -22,15 +21,10 @@ NeedConfig: yes
Depends: vim
Avoid: vim-gnome, vim-gtk, vim-lesstif, vim-nox
- default, and these need ~30 MiB on the CD to fit.
- Avoid the vim variations, we only want one vim, and
- vim is the best
Suggests: emacs
Depends: nullidentd | ident-server, openbsd-inetd
- happy. Depend directly on openbsd-inetd to make sure we
- avoid inetutils-inetd as long as bug #519316 is present.
Depends: man-db, manpages, ethtool, hdparm, pciutils,
nictools-pci, apt-listchanges,
@@ -56,31 +50,21 @@ Ignore: smartmontools | smartsuite, smart-notifier,
rkhunter
Recommends: gdb, valgrind
- backtrace of crashing applications. Valgrind make it
- possible to figure out why a program crashed.
Depends: debian-edu-doc-en
Depends: debian-edu-config, debian-edu-install, debconf-utils
Suggests: popularity-contest, debian-goodies
- to http://popcon.skolelinux.org/popcon/. The popcon package
- is pulled in by Debian Installer, so no need to list it in
- our tasks.
NeedConfig: yes - get it to submit to both debian and debian-edu.
Depends: consolekit, libpam-ck-connector
- for dbus to know who to give access to local devices.
Recommends: libpam-tmpdir
- to access for others.
Recommends: libnss-myhostname
- when the host name changes. Look out for bug #705900 if
- it ever reappear.
Depends: unattended-upgrades
- easier to enable automatic upgrades of new versions.
Suggests: kexec-tools
@@ -106,25 +90,20 @@ Ignore: apache2-mpm-worker,
fonts-thai-tlwg, w3m,
wamerican, xfce4-terminal, xfdesktop4,
xfsprogs, xkeyboard-config, xmessage, xpmutils
- we want to install them as part of some task.
Ignore: tofrodos, gocr, quota, cervisia,
gphoto2, kompare, pwgen
- we want to install them as part of some task.
Ignore: dc, doc-debian, iamerican, ibritish, ispell,
mpack, mutt, python-newt,
tcsh, texinfo, time, w3m, akregator,
blinken, cdparanoia, edict
- desktop tasks, until we know if we want to install them
- as part of some task.
Ignore: backuppc, rsync, libfile-rsyncp-perl
NeedConfig: yes
Avoid: xmail, ssmtp, smail, sendmail-bin, postfix, nullmailer, nbsmtp,
msmtp-mta, masqmail, esmtp-run, courier-mta
- default (exim).
Avoid: libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-oss,
libsdl1.2debian-nas, atlas3-base, atlas3-sse,
@@ -200,14 +179,11 @@ Avoid: linux-image-2.6-powerpc-smp, linux-image-2.6.32-5-powerpc-smp,
uinput-modules-2.6.32-5-powerpc64-di,
usb-serial-modules-2.6.32-5-powerpc64-di,
xfs-modules-2.6.32-5-powerpc64-di
- (and the DVD, but that is not the primary reason) to try to
- get all the packages needed by the installer on the CD.
Ignore: tmpreaper
Suggests: firmware-bnx2, firmware-ipw2x00, firmware-iwlwifi, firmware-qlogic,
firmware-ralink
- packages.
Depends: cups, foomatic-db, foomatic-db-engine, foomatic-db-gutenprint,
cups-filters | foomatic-filters,
@@ -216,11 +192,9 @@ Depends: cups, foomatic-db, foomatic-db-engine, foomatic-db-gutenprint,
Suggests: foo2zjs
Ignore: escputil
Avoid: lpr
- All hosts can be print servers, so this is part of networked task.
Recommends: bash-completion
Depends: cifs-utils
Recommends: command-not-found
- they are looking for.
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index ea82440..3a8b981 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -24,4 +24,3 @@ Depends: libreoffice-gnome, libreoffice-gtk3, libreoffice-writer,
Depends: totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
Recommends: ssh-askpass-gnome | ssh-askpass
- tty available.
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index cc187c4..0867a9b 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -28,8 +28,6 @@ Recommends: bluedevil
Depends: lightdm | x-display-manager
Avoid: xdm
- Pick lightdm and not the most feature complete one gdm3,
- because gdm3 pulls in Gnome.
NeedConfig: yes - artwork
Depends: dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer
@@ -48,4 +46,3 @@ Recommends: kde-l10n-es, kde-l10n-it, kde-l10n-de, kde-l10n-fr,
Recommends: libreoffice-kde
Recommends: ksshaskpass | ssh-askpass
- tty available.
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index 290b1f2..f1841dd 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -19,12 +19,8 @@ Recommends: blueman
Depends: lightdm | x-display-manager
Avoid: xdm
- manager by default. Keep it, and do not override and
- pick the most feature complete one gdm3 instead because
- it pull in Gnome when installed.
NeedConfig: yes - artwork
Depends: totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
Recommends: ssh-askpass
- tty available.
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index dcb3398..1a096c7 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -24,4 +24,3 @@ Depends: libreoffice-gtk2, libreoffice-writer,
Depends: vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer
Recommends: ssh-askpass-gnome | ssh-askpass
- tty available (using GNOME's ssh-askpass here).
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 670b83f..9eb1f08 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -148,7 +148,6 @@ Suggests: firefox-esr-l10n-af,
NeedConfig: yes, Cache, Printerapp, proxy server
Recommends: chromium
- handle some web pages.
NeedConfig: yes - set system wide proxy settings
Depends: gecko-mediaplayer | mozilla-plugin-vlc
@@ -169,17 +168,8 @@ Depends: konqueror-plugin-gnash, browser-plugin-gnash | mozilla-plugin-gnash
Suggests: flashplugin-nonfree
Ignore: browser-plugin-lightspark
Avoid: flashplugin-nonfree
- packages gnash need to play youtube videos. The depends
- and recommends are changed to suggests until gnash is
- ready for production use.
- Avoid the flashplugin-nonfree package on the DVD as it
- is fragile and sensitive to changes on the adobe web page.
- [pere 2007-07-12]
Recommends: default-jre, icedtea-8-plugin
- development tools in the standard installation. Info om
- Debian and Java is available from
- <URL:http://www.debian.org/doc/manuals/debian-java-faq/>.
Depends: debian-edu-artwork, plymouth, plymouth-themes
NeedConfig: yes - kdm and kde need to be configured to use it.
@@ -190,19 +180,16 @@ Avoid: pgp
Depends: avahi-daemon, libnss-mdns
Suggests: avahi-discover, mdns-scan, avahi-autoipd
- network configuration.
Depends: cups-client, cups-bsd
Depends: unzip, zip, bzip2
Ignore: ifplugd
- long time when the interface is brought up
NeedConfig: yes - the if listed in /etc/default/ifplugd must not has auto eth(?) in interface
Depends: isc-dhcp-client | dhcp3-client
Avoid: pump
- as it is the one used by default in Debian/Squeeze.
Depends: freerdp-x11 | rdesktop
have a Linux Desktop
@@ -227,8 +214,6 @@ Ignore: gcompris-sound-ar, gcompris-sound-bg, gcompris-sound-br,
gcompris-sound-cs, gcompris-sound-el, gcompris-sound-hi,
gcompris-sound-id, gcompris-sound-mr, gcompris-sound-so,
gcompris-sound-sr, gcompris-sound-ur
- The programs gnuchess, gnucap and tuxpaint are used by
- gcompris when present.
Suggests: smbclient
@@ -248,7 +233,6 @@ Suggests: gnuplot
Suggests: texlive, texlive-doc-base, lacheck, auctex, texlive-latex-base
Ignore: texlive-full
- are the Lenny replacement packages for tetex.
Suggests: lyx,
texmacs
@@ -262,8 +246,6 @@ Ignore: gimp-help-de, gimp-help-en, gimp-help-fr,
Recommends: cheese
Recommends: sane, sane-utils, skanlite, ocrad
- available, and software to drive them should be available
- in Skolelinux.
NeedConfig: yes
Recommends: hunspell-en-gb,
@@ -278,8 +260,6 @@ Recommends: hunspell-en-gb,
myspell-pt-pt,
tmispell-voikko
Suggests: hunspell-de-at, hunspell-de-ch, myspell-fr-gut
- It might be required to check that the language is
- supported by Skolelinux.
Suggests: lightspeed
@@ -297,15 +277,11 @@ Ignore: f-spot
Recommends: tuxmath
Ignore: ttf-mscorefonts-installer
- the installation package on the DVD. We provide
- fonts-liberation which is a free software alternative to
- the MS fonts.
Ignore: nvidia-settings, dosemu,
kmessedwords, gs,
Suggests: tablix2, gtablix, fet
- of courses, students, and teachers.
Ignore: qemu, qemu-launcher, qemuctl
@@ -323,7 +299,6 @@ Suggests: kpat, kbattleship,
katomic, klickety, kblackbox, kjumpingcube,
kmahjongg, kreversi
Ignore: kdegames
- installation. Is this a good idea to do for schools?
Recommends: education-astronomy, education-chemistry,
education-electronics, education-geography,
@@ -340,7 +315,6 @@ Suggests: kernel-package, libncurses5-dev
Ignore: mgp
Ignore: gtkwhiteboard, bluetooth, xournal, wmgui, wminput
- See <URL:http://www.wiiteachers.com/> for example IR pens.
Ignore: kde-l10n-ar, kde-l10n-bg,
kde-l10n-bs, kde-l10n-ca,
@@ -358,7 +332,6 @@ Ignore: kde-l10n-ar, kde-l10n-bg,
kde-l10n-sr,
kde-l10n-tr, kde-l10n-uk,
kde-l10n-zhcn, kde-l10n-zhtw
- noise in the package reports.
Suggests: controlaula
NeedConfig: yes
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index ed6fcae..e80f7c0 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -12,13 +12,8 @@ Depends: education-common
Depends: xfce4, xfce4-goodies
Depends: lightdm | x-display-manager
- Pick lightdm like for LXDE. Do not override and pick
- the most feature complete one gdm3 instead because it
- pull in Gnome when installed.
- The Xfce desktop environment tools recommended by tasksel.
Recommends: system-config-printer, tango-icon-theme
Recommends: blueman
Recommends: ssh-askpass
- tty available.
diff --git a/tasks/graphics b/tasks/graphics
index 7a582b3..d292a42 100644
--- a/tasks/graphics
+++ b/tasks/graphics
@@ -12,4 +12,3 @@ Suggests: xfig, xaos, tgif, hugin, blender
Ignore: dcraw
Depends: scribus
-
diff --git a/tasks/lang-da-desktop b/tasks/lang-da-desktop
index 7b07743..a7e8bce 100644
--- a/tasks/lang-da-desktop
+++ b/tasks/lang-da-desktop
@@ -10,10 +10,7 @@ Depends: gcompris-sound-da
Recommends: libreoffice-help-da,
libreoffice-l10n-da
- itself is in desktop-other.
Recommends: firefox-esr-l10n-da
- in desktop-other.
Suggests: thunderbird-l10n-da
- suggested in desktop-other.
diff --git a/tasks/lang-fr-desktop b/tasks/lang-fr-desktop
index 8b05078..0ee0350 100644
--- a/tasks/lang-fr-desktop
+++ b/tasks/lang-fr-desktop
@@ -20,4 +20,3 @@ Recommends: firefox-esr-l10n-fr
Suggests: thunderbird-l10n-fr
Suggests: aptitude-doc-fr
- is installed by default in Debian.
diff --git a/tasks/lang-ja-desktop b/tasks/lang-ja-desktop
index 16b6fda..912b303 100644
--- a/tasks/lang-ja-desktop
+++ b/tasks/lang-ja-desktop
@@ -8,7 +8,6 @@ Description: Debian Edu Desktop applications for Japanese installs
Recommends: fonts-vlgothic, ibus-anthy
Avoid: cmap-adobe-japan1
- the DVD.
Recommends: libreoffice-l10n-ja,
libreoffice-help-ja
@@ -18,4 +17,3 @@ Recommends: firefox-esr-l10n-ja
Suggests: thunderbird-l10n-ja
Suggests: aptitude-doc-ja
- is installed by default in Debian.
diff --git a/tasks/laptop b/tasks/laptop
index e85c417..fada05b 100644
--- a/tasks/laptop
+++ b/tasks/laptop
@@ -24,4 +24,3 @@ Recommends: usb-modeswitch
Ignore: build-essential, module-assistant,
ndiswrapper-source, linux-wlan-ng-source
- default kernel, and the tools needed to build them.
diff --git a/tasks/ltsp-server b/tasks/ltsp-server
index aba4db0..d66adc2 100644
--- a/tasks/ltsp-server
+++ b/tasks/ltsp-server
@@ -12,7 +12,6 @@ Depends: isc-dhcp-server-ldap
NeedConfig: yes
Depends: atftpd | tftpd-hpa, tftp-hpa
- recommended.
NeedConfig: yes
Depends: ltsp-server, ltspfs, ldm-server, squashfs-tools
@@ -38,7 +37,6 @@ Recommends: pulseaudio, pulseaudio-esound-compat, pulseaudio-utils
Suggests: libpulse-mainloop-glib0
Recommends: nagios-nrpe-server, monitoring-plugins-standard
- probe their status.
NeedConfig: yes - done by sitesummary-client using preseeding
Recommends: xrdp, tightvncserver
diff --git a/tasks/main-server b/tasks/main-server
index cb871a7..43430ea 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -7,7 +7,6 @@ Description: Debian Edu main server packages
main server installations in the Debian Edu Blend.
Depends: education-networked
- skolelinux machines
Depends: iptables
Ignore: shorewall
@@ -15,7 +14,6 @@ NeedConfig: yes - set up default firewall rules
Depends: avahi-daemon, libnss-mdns
Suggests: avahi-discover, mdns-scan, avahi-autoipd
- configuration and print server discovery
Depends: bind9 | pdns-backend-ldap
Suggests: nslint, dnswalk, dlint
@@ -29,7 +27,6 @@ Depends: isc-dhcp-server-ldap, pxelinux, syslinux-common,
debian-installer-9-netboot-amd64 | debian-installer-8-netboot-amd64,
atftpd | tftpd-hpa
Recommends: memtest86+
- and enable PXE install.
NeedConfig: yes - set local IP range, DNS name and default routing
Depends: slapd, openssl
@@ -46,7 +43,6 @@ 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
- servers.
NeedConfig: yes
Depends: links
@@ -66,18 +62,15 @@ Suggests: calamaris, squidguard, sarg
NeedConfig: yes
Suggests: dsh
- machines.
NeedConfig: yes - configure host groups
Depends: ntp
- is done using cfengine.
NeedConfig: yes - set NTP server (client: ntp.intern, server: ntp.somewhere)
Depends: slbackup, slbackup-php
NeedConfig: yes - debconf (only the slbackup package)
Avoid: telnetd, ftpd
- should be listed.
Depends: munin
NeedConfig: yes - done automatically by preseeding sitesummary
@@ -102,15 +95,11 @@ NeedConfig: yes
Ignore: koha
Homepage: http://www.koha.org/
WNPP: 389876
- is part of the Suse Edu distro, so I add it here to track
- it in Debian Edu.
Depends: krb5-kdc, krb5-admin-server, krb5-kdc-ldap, libsasl2-modules-gssapi-mit
- Distribution Server.
NeedConfig: yes - configure realm and the LDAP server as backend
Recommends: libapache2-mod-auth-kerb
- See <URL: http://www.itefix.no/i2/node/11683 > for a recipe.
NeedConfig: yes - individual services like Nagios need to use the apache module
Suggests: krb5-doc, libsasl2-modules-ldap
diff --git a/tasks/music b/tasks/music
index d5e34e4..623af7a 100644
--- a/tasks/music
+++ b/tasks/music
@@ -15,8 +15,6 @@ Avoid: lilypond-doc
Ignore: cmt
Depends: rosegarden, swh-plugins, mcp-plugins, qsynth, fluidsynth,
- fluid-soundfont-gm, qjackctl, jackd
- and a few useful packages as well.
NeedConfig: yes - configure the midi configuration
Depends: lenmus
diff --git a/tasks/networked b/tasks/networked
index e9f169b..ac55c6e 100644
--- a/tasks/networked
+++ b/tasks/networked
@@ -8,11 +8,9 @@ Description: Debian Edu network packages
and minimal) in the Debian Edu Blend.
Depends: education-networked-common
- skolelinux machines
Depends: libpam-krb5
Depends: nscd
Depends: network-manager
- except the main-server.
diff --git a/tasks/networked-common b/tasks/networked-common
index 5b3d9b6..3b9ec7c 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -21,8 +21,6 @@ NeedConfig: yes - set NTP server (client: ntp.local, server: ntp.extern)
Depends: nfs-common
Avoid: fam
- changes. Should be installed, but have proven buggy, avoid
- for now.
Depends: autofs-ldap | autofs5-ldap
NeedConfig: yes - making sure autofs is disabled on mainserver
@@ -48,7 +46,6 @@ 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>
- for more info.
NeedConfig: yes
Depends: openssh-server
@@ -58,7 +55,6 @@ NeedConfig: yes - enable X login etc
Depends: shutdown-at-night
Recommends: nvram-wakeup
- them on in the morning.
NeedConfig: yes - enable wake-on-lan sending based on sitesummary information.
Ignore: unburden-home-dir
diff --git a/tasks/roaming-workstation b/tasks/roaming-workstation
index 953b88f..bb23835 100644
--- a/tasks/roaming-workstation
+++ b/tasks/roaming-workstation
@@ -8,7 +8,6 @@ Description: Debian Edu networked roaming workstation packages
Blend where the client might go offine once in a while.
Depends: education-networked-common
- skolelinux machines
Depends: education-desktop-other
@@ -19,12 +18,9 @@ Depends: libnss-mdns
Depends: libpam-mklocaluser
Depends: libpam-sss, libnss-sss
- offline.
NeedConfig: yes - sssd.conf need to point to our LDAP and Kerberos server
Recommends: krb5-auth-dialog
- task and not networked task, as it should not be included
- on main-server installations.
Depends: gosa-desktop
NeedConfig: yes - override upstream url using /etc/gosa/desktoprc
diff --git a/tasks/standalone b/tasks/standalone
index 5824567..09c6d09 100644
--- a/tasks/standalone
+++ b/tasks/standalone
@@ -7,13 +7,11 @@ Description: Debian Edu standalone workstation packages
small standalone workstation installations in the Debian Edu Blend.
Depends: education-common
- skolelinux machines
Depends: education-desktop-other
Depends: sudo
Depends: plasma-nm | network-manager-gnome
- manager suite seem to be best at the moment.
Depends: libnss-mdns
diff --git a/tasks/thin-client b/tasks/thin-client
index 0a5ac6b..e070305 100644
--- a/tasks/thin-client
+++ b/tasks/thin-client
@@ -7,7 +7,6 @@ Description: Debian Edu networked thin client packages
Depends: ltsp-client, iputils-ping
Recommends: alsa-utils, acpi-support-base
- archive, network, sound and ACPI.
Depends: debian-edu-artwork
diff --git a/tasks/workstation b/tasks/workstation
index dad26ee..4e163d4 100644
--- a/tasks/workstation
+++ b/tasks/workstation
@@ -13,13 +13,8 @@ Depends: education-networked
Depends: education-desktop-other
Recommends: krb5-auth-dialog
- In workstation task and not networked task, as it should not
- be included on standalone installations.
Suggests: kredentials
- In workstation task and not networked task, as it should not
- be included on standalone installations. Note: krb5-auth-dialog
- seems to be better suited as kredentials assumes afs is used.
Recommends: jxplorer
--
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