[debian-edu-commits] [Git][debian-edu/debian-edu][master] 4 commits: tasks/thin-client: Add Recommends: desktop-autoloader.
WolfgangSchweer
gitlab at salsa.debian.org
Wed Jul 18 13:35:56 BST 2018
WolfgangSchweer pushed to branch master at Debian Edu / debian-edu
Commits:
7dd1deaa by Wolfgang Schweer at 2018-07-18T13:44:54+02:00
tasks/thin-client: Add Recommends: desktop-autoloader.
- - - - -
735cf981 by Wolfgang Schweer at 2018-07-18T13:47:07+02:00
tasks/main-server: Drop alternatives debian-installer-9-netboot-{amd64,i386}.
These are not useful even during development, only consumes time and space.
- - - - -
2d9d120f by Wolfgang Schweer at 2018-07-18T14:03:37+02:00
Updated after running 'make dist' (using blends-dev 0.7.2).
- - - - -
16ed11d5 by Wolfgang Schweer at 2018-07-18T14:03:56+02:00
Add changelog entries for last commits.
- - - - -
5 changed files:
- debian-edu-tasks.desc
- debian/changelog
- debian/control
- tasks/main-server
- tasks/thin-client
Changes:
=====================================
debian-edu-tasks.desc
=====================================
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -8,25 +8,6 @@ Enhances: education-desktop-other
Test-edu-preferred-desktop: gnome
Key:
education-desktop-gnome
-Packages: list
- dasher
- education-astronomy
- education-chemistry
- education-common
- education-electronics
- education-geography
- education-graphics
- education-language
- education-logic-games
- education-mathematics
- education-misc
- education-music
- education-physics
- gnome
- gnome-shell-extension-onboard
- kdeedu
- ssh-askpass
- ssh-askpass-gnome
Task: education-desktop-kde
Section: debian-edu
@@ -52,56 +33,6 @@ Enhances: education-desktop-other
Test-edu-preferred-desktop: kde
Key:
education-desktop-kde
-Packages: list
- ark
- bluedevil
- clementine
- digikam
- education-astronomy
- education-chemistry
- education-common
- education-electronics
- education-geography
- education-graphics
- education-language
- education-logic-games
- education-mathematics
- education-misc
- education-music
- education-physics
- kamera
- kcalc
- kde-l10n-ca
- kde-l10n-de
- kde-l10n-el
- kde-l10n-engb
- kde-l10n-es
- kde-l10n-fr
- kde-l10n-it
- kde-l10n-nl
- kde-l10n-ptbr
- kde-l10n-ru
- kde-l10n-sv
- kde-standard
- kdeaccessibility
- kdeedu
- kdegraphics-thumbnailers
- kdeutils
- kfloppy
- kinfocenter
- kio-audiocd
- kipi-plugins
- knotes
- konq-plugins
- konversation
- kopete
- krdc
- krfb
- ksshaskpass
- kwalletmanager
- kwin-x11
- plasma-workspace-wallpapers
- ssh-askpass
Task: education-desktop-lxde
Section: debian-edu
@@ -113,32 +44,6 @@ Enhances: education-desktop-other
Test-edu-preferred-desktop: lxde
Key:
education-desktop-lxde
-Packages: list
- atril
- blueman
- desktop-file-utils
- education-astronomy
- education-chemistry
- education-common
- education-electronics
- education-geography
- education-graphics
- education-language
- education-logic-games
- education-mathematics
- education-misc
- education-music
- education-physics
- fotoxx
- galculator
- hexchat
- kdeedu
- lxde
- mtpaint
- osmo
- parcellite
- pidgin
- ssh-askpass
Task: education-desktop-lxqt
Section: debian-edu
@@ -150,32 +55,6 @@ Enhances: education-desktop-other
Test-edu-preferred-desktop: lxqt
Key:
education-desktop-lxqt
-Packages: list
- atril
- blueman
- desktop-file-utils
- education-astronomy
- education-chemistry
- education-common
- education-electronics
- education-geography
- education-graphics
- education-language
- education-logic-games
- education-mathematics
- education-misc
- education-music
- education-physics
- fotoxx
- galculator
- hexchat
- kdeedu
- lxqt
- mtpaint
- osmo
- parcellite
- pidgin
- ssh-askpass
Task: education-desktop-mate
Section: debian-edu
@@ -187,40 +66,6 @@ Enhances: education-desktop-other
Test-edu-preferred-desktop: mate
Key:
education-desktop-mate
-Packages: list
- arctica-greeter
- arctica-greeter-theme-debian
- cmst
- dasher
- dragonplayer
- education-astronomy
- education-chemistry
- education-common
- education-electronics
- education-geography
- education-graphics
- education-language
- education-logic-games
- education-mathematics
- education-misc
- education-music
- education-physics
- gnome-accessibility-themes
- gnome-orca
- kaffeine
- kdeedu
- libreoffice-gtk3
- mate-desktop-environment
- mate-desktop-environment-extras
- mplayer
- network-manager-gnome
- onboard
- ssh-askpass
- ssh-askpass-gnome
- totem
- vlc
- wicd
- xine-ui
Task: education-desktop-other
Section: debian-edu
@@ -245,142 +90,6 @@ Relevance: 10
Test-edu-profile: Workstation LTSP-Server Standalone
Key:
education-desktop-other
-Packages: list
- alsa-utils
- avahi-daemon
- brasero
- brasero
- bzip2
- cheese
- chromium
- cups-bsd
- cups-client
- debian-edu-artwork
- default-jre
- djview-plugin
- dragonplayer
- firefox-esr
- firefox-esr-l10n-ca
- firefox-esr-l10n-de
- firefox-esr-l10n-el
- firefox-esr-l10n-en-gb
- firefox-esr-l10n-es-ar
- firefox-esr-l10n-es-es
- firefox-esr-l10n-fr
- firefox-esr-l10n-it
- firefox-esr-l10n-nl
- firefox-esr-l10n-pt-br
- firefox-esr-l10n-ru
- firefox-esr-l10n-sv-se
- fonts-freefont-ttf
- fonts-liberation
- fonts-linex
- freerdp2-x11
- gimp
- gimp-data-extras
- gimp-help-ca
- gimp-help-de
- gimp-help-el
- gimp-help-en
- gimp-help-es
- gimp-help-fr
- gimp-help-it
- gimp-help-nl
- gimp-help-pt
- gimp-help-ru
- gimp-help-sv
- gimp-ufraw
- gir1.2-vte-2.91
- gnupg
- gnupg-agent
- gsfonts-x11
- gtk-recordmydesktop
- hunspell-ca
- hunspell-de-de
- hunspell-en-gb
- hunspell-it
- hunspell-nl
- hunspell-ru
- hunspell-sv-se
- icedtea-8-plugin
- inkscape
- isc-dhcp-client
- k3b
- k3b-i18n
- kaffeine
- kvpm
- libgl1-mesa-dri
- libnss-mdns
- libreoffice
- libreoffice-help-ca
- libreoffice-help-de
- libreoffice-help-el
- libreoffice-help-en-gb
- libreoffice-help-en-us
- libreoffice-help-es
- libreoffice-help-fr
- libreoffice-help-it
- libreoffice-help-nl
- libreoffice-help-pt-br
- libreoffice-help-ru
- libreoffice-help-sv
- libreoffice-l10n-ca
- libreoffice-l10n-de
- libreoffice-l10n-el
- libreoffice-l10n-en-gb
- libreoffice-l10n-es
- libreoffice-l10n-fr
- libreoffice-l10n-it
- libreoffice-l10n-nl
- libreoffice-l10n-pt-br
- libreoffice-l10n-sv
- mplayer
- myspell-el-gr
- myspell-es
- myspell-fr
- myspell-pt-br
- mythes-ca
- mythes-de
- mythes-de-ch
- mythes-en-us
- mythes-es
- mythes-fr
- mythes-it
- mythes-ru
- mythes-sv
- numlockx
- ocrad
- openclipart
- openclipart-libreoffice
- pavucontrol
- plymouth
- plymouth-themes
- rdesktop
- sane
- sane-utils
- skanlite
- standardskriver
- synaptic
- thunderbird-l10n-ca
- thunderbird-l10n-de
- thunderbird-l10n-el
- thunderbird-l10n-en-gb
- thunderbird-l10n-es-ar
- thunderbird-l10n-es-es
- thunderbird-l10n-fr
- thunderbird-l10n-it
- thunderbird-l10n-nl
- thunderbird-l10n-pt-br
- thunderbird-l10n-ru
- thunderbird-l10n-sv-se
- tmispell-voikko
- totem
- unifont
- unzip
- vlc
- xine-ui
- xul-ext-adblock-plus
- zip
Task: education-desktop-xfce
Section: debian-edu
@@ -392,30 +101,6 @@ Enhances: education-desktop-other
Test-edu-preferred-desktop: xfce
Key:
education-desktop-xfce
-Packages: list
- blueman
- cmst
- education-astronomy
- education-chemistry
- education-common
- education-electronics
- education-geography
- education-graphics
- education-language
- education-logic-games
- education-mathematics
- education-misc
- education-music
- education-physics
- kdeedu
- network-manager-gnome
- ssh-askpass
- system-config-printer
- tango-icon-theme
- wicd
- xfce4
- xfce4-goodies
- xfce4-notifyd
Task: education-lang-da
Section: debian-edu
@@ -426,9 +111,6 @@ Relevance: 10
Test-always-lang: da
Key:
education-lang-da
-Packages: list
- debian-edu-doc-da
- myspell-da
Task: education-lang-da-desktop
Section: debian-edu
@@ -440,11 +122,6 @@ Relevance: 10
Enhances: education-desktop-other, education-lang-da
Key:
education-lang-da-desktop
-Packages: list
- firefox-esr-l10n-da
- libreoffice-help-da
- libreoffice-l10n-da
- thunderbird-l10n-da
Task: education-lang-de
Section: debian-edu
@@ -455,12 +132,6 @@ Relevance: 10
Test-always-lang: de
Key:
education-lang-de
-Packages: list
- debian-edu-doc-de
- hunspell-de-at
- hunspell-de-ch
- hunspell-de-de
- manpages-de
Task: education-lang-es
Section: debian-edu
@@ -471,10 +142,6 @@ Relevance: 10
Test-always-lang: es
Key:
education-lang-es
-Packages: list
- debian-edu-doc-es
- manpages-es-extra
- myspell-es
Task: education-lang-fr
Section: debian-edu
@@ -485,9 +152,6 @@ Relevance: 10
Test-always-lang: fr
Key:
education-lang-fr
-Packages: list
- debian-edu-doc-fr
- myspell-fr
Task: education-lang-he
Section: debian-edu
@@ -498,10 +162,6 @@ Relevance: 10
Test-always-lang: he
Key:
education-lang-he
-Packages: list
- aspell-he
- hspell
- myspell-he
Task: education-lang-he-desktop
Section: debian-edu
@@ -513,11 +173,6 @@ Relevance: 10
Enhances: education-desktop-other, education-lang-he
Key:
education-lang-he-desktop
-Packages: list
- firefox-esr-l10n-he
- libfribidi0
- libreoffice-l10n-he
- thunderbird-l10n-he
Task: education-lang-it
Section: debian-edu
@@ -528,9 +183,6 @@ Relevance: 10
Test-always-lang: it
Key:
education-lang-it
-Packages: list
- debian-edu-doc-it
- hunspell-it
Task: education-lang-ja
Section: debian-edu
@@ -541,8 +193,6 @@ Relevance: 10
Test-always-lang: ja
Key:
education-lang-ja
-Packages: list
- debian-edu-doc-ja
Task: education-lang-ja-desktop
Section: debian-edu
@@ -554,12 +204,6 @@ Relevance: 10
Enhances: education-desktop-other, education-lang-ja
Key:
education-lang-ja-desktop
-Packages: list
- firefox-esr-l10n-ja
- fonts-vlgothic
- libreoffice-help-ja
- libreoffice-l10n-ja
- thunderbird-l10n-ja
Task: education-lang-no
Section: debian-edu
@@ -570,11 +214,6 @@ Relevance: 10
Test-always-lang: no nb nn
Key:
education-lang-no
-Packages: list
- aspell-no
- debian-edu-doc-nb
- myspell-nb
- myspell-nn
Task: education-lang-no-desktop
Section: debian-edu
@@ -586,14 +225,6 @@ Relevance: 10
Enhances: education-desktop-other, education-lang-no
Key:
education-lang-no-desktop
-Packages: list
- firefox-esr-l10n-nb-no
- firefox-esr-l10n-nn-no
- gimp-help-nn
- libreoffice-l10n-nb
- libreoffice-l10n-nn
- thunderbird-l10n-nb-no
- thunderbird-l10n-nn-no
Task: education-lang-se
Section: debian-edu
@@ -604,8 +235,6 @@ Relevance: 10
Test-always-lang: se
Key:
education-lang-se
-Packages: list
- hunspell-se
Task: education-lang-zh-tw
Section: debian-edu
@@ -616,8 +245,6 @@ Relevance: 10
Test-always-lang: zh_TW
Key:
education-lang-zh-tw
-Packages: list
- fonts-arphic-ukai
Task: education-lang-zh-tw-desktop
Section: debian-edu
@@ -629,18 +256,6 @@ Relevance: 10
Enhances: education-desktop-other, education-lang-zh-tw
Key:
education-lang-zh-tw-desktop
-Packages: list
- firefox-esr-l10n-zh-tw
- fonts-arphic-uming
- fonts-wqy-microhei
- fonts-wqy-zenhei
- ibus-array
- ibus-chewing
- im-config
- libreoffice-help-zh-tw
- libreoffice-l10n-zh-tw
- lightning-l10n-zh-tw
- thunderbird-l10n-zh-tw
Task: education-laptop
Section: debian-edu
@@ -652,12 +267,6 @@ Relevance: 10
Test-always-laptop: 1
Key:
education-laptop
-Packages: list
- bluedevil
- laptop-mode-tools
- powertop
- unison
- usb-modeswitch
Task: education-ltsp-server
Section: debian-edu
@@ -668,25 +277,6 @@ Relevance: 10
Test-edu-profile: LTSP-Server
Key:
education-ltsp-server
-Packages: list
- education-workstation
- iptables
- isc-dhcp-server-ldap
- ldm-server
- ltsp-server
- ltspfs
- lwm
- monitoring-plugins-standard
- nagios-nrpe-server
- nbd-server
- pulseaudio
- pulseaudio-utils
- rdiff-backup
- squashfs-tools
- tftp-hpa
- tightvncserver
- x2goserver
- xrdp
Task: education-main-server
Section: debian-edu
@@ -697,65 +287,6 @@ Relevance: 10
Test-edu-profile: Main-Server
Key:
education-main-server
-Packages: list
- apache2
- avahi-daemon
- bind9
- debian-installer-9-netboot-amd64
- debian-installer-9-netboot-i386
- dovecot-gssapi
- dovecot-imapd
- education-networked
- exim4-daemon-heavy
- gosa
- gosa-help-de
- gosa-help-en
- gosa-help-fr
- gosa-help-nl
- gosa-plugin-dhcp
- gosa-plugin-dhcp-schema
- gosa-plugin-dns
- gosa-plugin-dns-schema
- gosa-plugin-goto
- gosa-plugin-ldapmanager
- gosa-plugin-netgroups
- gosa-plugin-pwreset
- gosa-plugin-samba
- gosa-plugin-sudo
- gosa-plugin-sudo-schema
- gosa-schema
- icinga
- iptables
- isc-dhcp-server-ldap
- krb5-admin-server
- krb5-kdc
- krb5-kdc-ldap
- ldap2zone
- libapache2-mod-auth-kerb
- libnss-mdns
- libnss3-tools
- libsasl2-modules-gssapi-mit
- links
- makepasswd
- memtest86+
- monitoring-plugins-standard
- munin
- nagios-nrpe-plugin
- nfs-kernel-server
- ntp
- openssl
- pxelinux
- samba
- samba-common-bin
- sitesummary
- slapd
- slbackup
- slbackup-php
- smbclient
- squid
- syslinux-common
- tdb-tools
- tftpd-hpa
Task: education-networked
Section: debian-edu
@@ -767,11 +298,6 @@ Relevance: 10
Test-edu-profile: Workstation Main-Server LTSP-Server
Key:
education-networked
-Packages: list
- education-networked-common
- libpam-krb5
- network-manager
- nscd
Task: education-networked-common
Section: debian-edu
@@ -783,25 +309,6 @@ Relevance: 10
Test-edu-profile: Minimal Workstation Roaming-Workstation Main-Server LTSP-Server
Key:
education-networked-common
-Packages: list
- autofs-ldap
- education-common
- killer
- krb5-user
- ldap-utils
- ldapvi
- libnss-ldapd
- libsasl2-modules-gssapi-mit
- munin-node
- nfs-common
- ng-utils
- nslcd
- ntp
- ntpdate
- nvram-wakeup
- openssh-server
- sitesummary-client
- sudo-ldap
Task: education-roaming-workstation
Section: debian-edu
@@ -813,20 +320,6 @@ Relevance: 10
Test-edu-profile: Roaming-Workstation
Key:
education-roaming-workstation
-Packages: list
- cmst
- education-desktop-other
- education-networked-common
- gosa-desktop
- isenkram
- krb5-auth-dialog
- libnss-mdns
- libnss-sss
- libpam-mklocaluser
- libpam-sss
- network-manager-gnome
- plasma-nm
- wicd
Task: education-standalone
Section: debian-edu
@@ -837,16 +330,6 @@ Relevance: 10
Test-edu-profile: Standalone
Key:
education-standalone
-Packages: list
- cmst
- education-common
- education-desktop-other
- isenkram
- libnss-mdns
- network-manager-gnome
- plasma-nm
- sudo
- wicd
Task: education-thin-client
Section: debian-edu
@@ -856,11 +339,6 @@ Description: Debian Edu LTSP client packages
Relevance: 10
Key:
education-thin-client
-Packages: list
- acpi-support-base
- alsa-utils
- debian-edu-artwork
- sitesummary-client
Task: education-workstation
Section: debian-edu
@@ -871,7 +349,4 @@ Relevance: 10
Test-edu-profile: Workstation Roaming-Workstation LTSP-Server
Key:
education-workstation
-Packages: list
- education-desktop-other
- education-networked
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu (2.10.32) UNRELEASED; urgency=medium
+
+ * tasks/thin-client: Add Recommends: desktop-autoloader.
+ Needs site specific configuration (activation included) to be useful.
+ * tasks/main-server: Drop debian-installer-9-netboot-{amd64,i386}.
+ These are not useful even during development; so save space and time.
+ * Updated after running 'make dist' (using blends-dev 0.7.2).
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Wed, 18 Jul 2018 13:51:10 +0200
+
debian-edu (2.10.31) unstable; urgency=medium
[ Wolfgang Schweer ]
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -383,6 +383,7 @@ Recommends: alsa-utils,
bzip2,
cheese,
chromium,
+ chromium-ublock-origin,
cups-bsd,
cups-client,
debian-edu-artwork,
@@ -504,11 +505,11 @@ Recommends: alsa-utils,
unifont,
unzip,
xul-ext-adblock-plus,
+ xul-ext-ublock-origin,
zip
Suggests: auctex,
avahi-autoipd,
avahi-discover,
- chromium-ublock-origin,
dia,
fet,
fonts-arphic-uming,
@@ -569,8 +570,7 @@ Suggests: auctex,
wget,
wine,
xfonts-100dpi-transcoded,
- xfonts-75dpi-transcoded,
- xul-ext-ublock-origin
+ xfonts-75dpi-transcoded
Description: Debian Edu common desktop applications
This metapackage depends on various office and desktop applications
that are useful for teachers and their students.
@@ -866,11 +866,11 @@ Depends: ${misc:Depends},
education-tasks (= ${source:Version})
Recommends: firefox-esr-l10n-ja,
fonts-vlgothic,
+ ibus-anthy,
libreoffice-help-ja,
libreoffice-l10n-ja,
thunderbird-l10n-ja
-Suggests: aptitude-doc-ja,
- ibus-anthy
+Suggests: aptitude-doc-ja
Description: Debian Edu Desktop enhancements for Japanese installs
This metapackage enhances various office and desktop applications
that are useful for teachers and their students when used on Japanese
@@ -1059,29 +1059,10 @@ Depends: ${misc:Depends},
Recommends: apache2,
avahi-daemon,
bind9,
- debian-installer-9-netboot-amd64,
- debian-installer-9-netboot-i386,
dovecot-gssapi,
dovecot-imapd,
education-networked,
exim4-daemon-heavy,
- gosa,
- gosa-help-de,
- gosa-help-en,
- gosa-help-fr,
- gosa-help-nl,
- gosa-plugin-dhcp,
- gosa-plugin-dhcp-schema,
- gosa-plugin-dns,
- gosa-plugin-dns-schema,
- gosa-plugin-goto,
- gosa-plugin-ldapmanager,
- gosa-plugin-netgroups,
- gosa-plugin-pwreset,
- gosa-plugin-samba,
- gosa-plugin-sudo,
- gosa-plugin-sudo-schema,
- gosa-schema,
icinga,
iptables,
isc-dhcp-server-ldap,
@@ -1125,6 +1106,23 @@ Suggests: apache2-doc,
dnswalk,
dovecot-pop3d,
dsh,
+ gosa,
+ gosa-help-de,
+ gosa-help-en,
+ gosa-help-fr,
+ gosa-help-nl,
+ gosa-plugin-dhcp,
+ gosa-plugin-dhcp-schema,
+ gosa-plugin-dns,
+ gosa-plugin-dns-schema,
+ gosa-plugin-goto,
+ gosa-plugin-ldapmanager,
+ gosa-plugin-netgroups,
+ gosa-plugin-pwreset,
+ gosa-plugin-samba,
+ gosa-plugin-sudo,
+ gosa-plugin-sudo-schema,
+ gosa-schema,
krb5-doc,
libsasl2-modules-ldap,
mdns-scan,
@@ -1325,7 +1323,6 @@ Depends: ${misc:Depends},
education-tasks (= ${source:Version})
Recommends: education-desktop-other,
education-networked-common,
- gosa-desktop,
isenkram,
krb5-auth-dialog,
libnss-mdns,
@@ -1333,6 +1330,7 @@ Recommends: education-desktop-other,
libpam-mklocaluser,
libpam-sss,
network-manager-gnome | plasma-nm | cmst | wicd
+Suggests: gosa-desktop
Description: Debian Edu roaming workstation packages
A metapackage containing dependencies for packages required on all
networked workstation installations in the Debian Edu Blend where the
@@ -1361,6 +1359,7 @@ Depends: ${misc:Depends},
Recommends: acpi-support-base,
alsa-utils,
debian-edu-artwork,
+ desktop-autoloader,
sitesummary-client
Description: Debian Edu LTSP client packages
This metapackage depends on various packages required on all
=====================================
tasks/main-server
=====================================
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -36,8 +36,8 @@ Recommends:
isc-dhcp-server-ldap,
pxelinux,
syslinux-common,
- debian-installer-10-netboot-i386 | debian-installer-9-netboot-i386,
- debian-installer-10-netboot-amd64 | debian-installer-9-netboot-amd64,
+ debian-installer-10-netboot-i386,
+ debian-installer-10-netboot-amd64,
tftpd-hpa,
NeedConfig: yes - set local IP range, DNS name and default routing
=====================================
tasks/thin-client
=====================================
--- a/tasks/thin-client
+++ b/tasks/thin-client
@@ -18,3 +18,6 @@ Recommends:
Recommends:
sitesummary-client,
+
+Recommends:
+ desktop-autoloader,
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/11c2278a308e64983eb6aa63fc500b55735fb647...16ed11d5aac8d75a6090a2108af1415fb9c2cfba
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/11c2278a308e64983eb6aa63fc500b55735fb647...16ed11d5aac8d75a6090a2108af1415fb9c2cfba
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20180718/4c30cd69/attachment-0001.html>
More information about the debian-edu-commits
mailing list