[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: Rework tasks files.
WolfgangSchweer
gitlab at salsa.debian.org
Fri Aug 10 11:40:47 BST 2018
WolfgangSchweer pushed to branch master at Debian Edu / debian-edu
Commits:
665528b1 by Wolfgang Schweer at 2018-08-10T10:34:18Z
Rework tasks files.
Insert linebreaks between Recommends/Suggests sections. This should make
sure that blends-dev generates a proper d/control file; 38 otherwise
missing Recommends will be added. Thanks to the d-e-config testsuite for
reporting missing nmap.
Remove remaining Avoid: and Ignore: sections; these are no longer useful,
now that official Debian installation media are generated without
blends-dev involved.
tasks/desktop-{gnome,kde,lxde,lxqt,mate,xfce}:
Add Suggests on education-video (same as for education-development).
- - - - -
d4a6ecf9 by Wolfgang Schweer at 2018-08-10T10:39:19Z
Updated after running 'make dist'.
- - - - -
dd49db3f by Wolfgang Schweer at 2018-08-10T10:39:45Z
d/changelog: Document tasks files changes.
- - - - -
23 changed files:
- debian/changelog
- debian/control
- tasks/astronomy
- tasks/chemistry
- tasks/common
- tasks/desktop-gnome
- tasks/desktop-kde
- tasks/desktop-lxde
- tasks/desktop-lxqt
- tasks/desktop-mate
- tasks/desktop-other
- tasks/desktop-xfce
- tasks/electronics
- tasks/geography
- tasks/laptop
- tasks/ltsp-server
- tasks/main-server
- tasks/mathematics
- tasks/misc
- tasks/music
- tasks/networked-common
- tasks/thin-client
- tasks/video
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,16 @@
debian-edu (2.10.34) UNRELEASED; urgency=medium
+ * Rework tasks files:
+ - Insert linebreaks between Recommends/Suggests sections. This should make
+ sure that blends-dev generates a proper d/control file; 39 otherwise
+ missing Recommends will be added. Thanks to the d-e-config testsuite for
+ reporting missing nmap.
+ - Remove remaining Avoid: and Ignore: sections; these are no longer useful,
+ now that official Debian installation media are generated without
+ blends-dev involved.
+ - tasks/desktop-{gnome,kde,lxde,lxqt,mate,xfce}:
+ Add Suggests on education-video (same as for education-development).
+ * Updated after running 'make dist'.
* d/control.stub: Adjust Standards-Version: (4.1.5 -> 4.2.0).
-- Wolfgang Schweer <wschweer at arcor.de> Wed, 08 Aug 2018 10:58:39 +0200
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -89,7 +89,10 @@ Section: metapackages
Architecture: any
Depends: ${misc:Depends},
education-tasks (= ${source:Version})
-Recommends: bash-completion,
+Recommends: apt-listchanges,
+ bash-completion,
+ bc,
+ bind9-host,
cifs-utils,
command-not-found,
convmv,
@@ -97,43 +100,74 @@ Recommends: bash-completion,
cups-browsed,
cups-filters | foomatic-filters,
debconf-utils,
+ debian-archive-keyring,
debian-edu-config,
debian-edu-doc-en,
debian-edu-install,
deborphan,
dhcping,
dmidecode,
+ eject,
+ etherwake,
+ ethtool,
finger,
foomatic-db-compressed-ppds,
foomatic-db-engine,
+ fping,
gdebi-core | gdebi,
hddtemp,
+ hdparm,
hpijs-ppds,
hplip,
htop,
+ hwinfo,
+ iftop,
+ iotop,
+ iproute2,
iputils-arping | arping,
+ less,
libnss-myhostname,
libpam-tmpdir,
+ libwww-perl,
lshw,
+ lsscsi,
+ man-db,
+ manpages,
mc,
memtest86+,
+ mlocate,
+ mtools,
+ mtr-tiny | mtr,
+ ncftp,
nictools-pci,
+ nmap,
nullidentd | ident-server,
openbsd-inetd,
openprinting-ppds,
openssh-client,
+ pciutils,
printer-driver-gutenprint,
printer-driver-hpcups,
printer-driver-hpijs,
printer-driver-pnm2ppa,
printer-driver-postscript-hp,
procinfo,
+ procmail,
+ psmisc,
python3-reportbug,
+ reportbug,
+ resolvconf,
rsync,
rsyslog,
screen,
smartmontools,
- vim
+ strace,
+ sysfsutils,
+ tcpdump,
+ tcptraceroute,
+ traceroute,
+ vim,
+ wget
Suggests: apticron | cron-apt,
cpqarrayd,
debian-goodies,
@@ -182,7 +216,8 @@ Recommends: dasher,
kdeedu,
ssh-askpass-gnome | ssh-askpass
Suggests: education-development,
- education-primaryschool
+ education-primaryschool,
+ education-video
Description: Debian Edu GNOME desktop applications
This metapackage depends on various GNOME office and desktop applications
that are useful for teachers and their students.
@@ -241,6 +276,7 @@ Recommends: ark,
plasma-workspace-wallpapers
Suggests: education-development,
education-primaryschool,
+ education-video,
kde-full,
kde-zeroconf,
kfind,
@@ -296,7 +332,8 @@ Recommends: atril,
pidgin,
ssh-askpass
Suggests: education-development,
- education-primaryschool
+ education-primaryschool,
+ education-video
Description: Debian Edu LXDE desktop applications
This metapackage depends on various LXDE components and lightweight
desktop applications that are useful for teachers and their students.
@@ -334,7 +371,8 @@ Recommends: atril,
ssh-askpass,
xorg
Suggests: education-development,
- education-primaryschool
+ education-primaryschool,
+ education-video
Description: Debian Edu LXQt desktop applications
This metapackage depends on various LXQt components and lightweight
desktop applications that are useful for teachers and their students.
@@ -372,7 +410,8 @@ Recommends: arctica-greeter,
vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer,
xorg
Suggests: education-development,
- education-primaryschool
+ education-primaryschool,
+ education-video
Description: Debian Edu MATE desktop applications
This metapackage depends on various MATE office and desktop applications
that are useful for teachers and their students.
@@ -492,6 +531,7 @@ Recommends: alsa-utils,
skanlite,
standardskriver,
synaptic,
+ thunderbird,
thunderbird-l10n-ca,
thunderbird-l10n-de,
thunderbird-l10n-el,
@@ -622,7 +662,8 @@ Recommends: blueman,
xfce4-notifyd,
xorg
Suggests: education-development,
- education-primaryschool
+ education-primaryschool,
+ education-video
Description: Debian Edu Xfce desktop applications
This metapackage depends on various Xfce components that are useful
for teachers and their students.
@@ -1271,6 +1312,7 @@ Recommends: autofs-ldap,
ntpdate,
nvram-wakeup,
openssh-server,
+ shutdown-at-night,
sitesummary-client,
sudo-ldap
Suggests: cifs-utils,
@@ -1366,6 +1408,9 @@ Recommends: acpi-support-base,
alsa-utils,
debian-edu-artwork,
desktop-autoloader,
+ iptables,
+ iputils-ping,
+ ltsp-client,
sitesummary-client
Description: Debian Edu LTSP client packages
This metapackage depends on various packages required on all
=====================================
tasks/astronomy
=====================================
--- a/tasks/astronomy
+++ b/tasks/astronomy
@@ -16,6 +16,7 @@ Recommends:
xplanet,
xplanet-images,
kstars,
+
Suggests:
sunclock,
xtide,
=====================================
tasks/chemistry
=====================================
--- a/tasks/chemistry
+++ b/tasks/chemistry
@@ -19,5 +19,6 @@ Recommends:
gperiodic,
chemtool,
kalzium,
+
Suggests:
rasmol,
=====================================
tasks/common
=====================================
--- a/tasks/common
+++ b/tasks/common
@@ -43,11 +43,13 @@ Recommends:
sysfsutils,
etherwake,
mlocate,
+
Recommends:
nictools-pci,
iputils-arping | arping,
finger,
gdebi-core | gdebi,
+
Suggests:
apticron | cron-apt,
nvram-wakeup,
@@ -55,6 +57,7 @@ Suggests:
Recommends:
reportbug,
+
Recommends:
python3-reportbug,
@@ -79,6 +82,7 @@ Recommends:
mtr-tiny | mtr,
fping,
iotop,
+
Recommends:
dmidecode,
rsync,
@@ -92,6 +96,7 @@ Recommends:
dhcping,
convmv,
smartmontools,
+
Suggests:
dpt-i2o-raidutils | raidutils,
cpqarrayd,
@@ -147,6 +152,7 @@ Recommends:
printer-driver-postscript-hp,
hpijs-ppds,
hplip,
+
Suggests:
printer-driver-foo2zjs,
=====================================
tasks/desktop-gnome
=====================================
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -32,9 +32,11 @@ Recommends:
education-music,
education-physics,
education-misc,
+
Suggests:
education-primaryschool,
education-development,
+ education-video,
Recommends:
kdeedu,
=====================================
tasks/desktop-kde
=====================================
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -45,6 +45,7 @@ Recommends:
digikam,
kipi-plugins,
kdeaccessibility,
+
Suggests:
knode,
kfind,
@@ -92,9 +93,11 @@ Recommends:
education-music,
education-physics,
education-misc,
+
Suggests:
education-primaryschool,
education-development,
+ education-video,
Recommends:
kdeedu,
=====================================
tasks/desktop-lxde
=====================================
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -42,9 +42,11 @@ Recommends:
education-music,
education-physics,
education-misc,
+
Suggests:
education-primaryschool,
education-development,
+ education-video,
Recommends:
kdeedu,
=====================================
tasks/desktop-lxqt
=====================================
--- a/tasks/desktop-lxqt
+++ b/tasks/desktop-lxqt
@@ -44,9 +44,11 @@ Recommends:
education-music,
education-physics,
education-misc,
+
Suggests:
education-primaryschool,
education-development,
+ education-video,
Recommends:
kdeedu,
=====================================
tasks/desktop-mate
=====================================
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -51,9 +51,11 @@ Recommends:
education-music,
education-physics,
education-misc,
+
Suggests:
education-primaryschool,
education-development,
+ education-video,
Recommends:
kdeedu,
=====================================
tasks/desktop-other
=====================================
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -72,107 +72,6 @@ Recommends:
libreoffice-help-sv,
openclipart-libreoffice,
openclipart,
-Ignore:
- libreoffice-help-cs,
- libreoffice-help-da,
- libreoffice-help-dz,
- libreoffice-help-et,
- libreoffice-help-eu,
- libreoffice-help-fi,
- libreoffice-help-gl,
- libreoffice-help-hi,
- libreoffice-help-hu,
- libreoffice-help-ja,
- libreoffice-help-km,
- libreoffice-help-ko,
- libreoffice-help-om,
- libreoffice-help-pl,
- libreoffice-help-pt,
- libreoffice-help-sk,
- libreoffice-help-sl,
- libreoffice-help-tr,
- libreoffice-help-vi,
- libreoffice-help-zh-cn,
- libreoffice-help-zh-tw,
- libreoffice-l10n-af,
- libreoffice-l10n-am,
- libreoffice-l10n-ar,
- libreoffice-l10n-as,
- libreoffice-l10n-ast,
- libreoffice-l10n-be,
- libreoffice-l10n-bg,
- libreoffice-l10n-bn,
- libreoffice-l10n-br,
- libreoffice-l10n-bs,
- libreoffice-l10n-cs,
- libreoffice-l10n-cy,
- libreoffice-l10n-da,
- libreoffice-l10n-dz,
- libreoffice-l10n-en-za,
- libreoffice-l10n-eo,
- libreoffice-l10n-et,
- libreoffice-l10n-eu,
- libreoffice-l10n-fa,
- libreoffice-l10n-fi,
- libreoffice-l10n-ga,
- libreoffice-l10n-gd,
- libreoffice-l10n-gl,
- libreoffice-l10n-gug,
- libreoffice-l10n-gu,
- libreoffice-l10n-he,
- libreoffice-l10n-hi,
- libreoffice-l10n-hr,
- libreoffice-l10n-hu,
- libreoffice-l10n-id,
- libreoffice-l10n-in,
- libreoffice-l10n-is,
- libreoffice-l10n-ja,
- libreoffice-l10n-ka,
- libreoffice-l10n-kk,
- libreoffice-l10n-km,
- libreoffice-l10n-kmr,
- libreoffice-l10n-ko,
- libreoffice-l10n-lt,
- libreoffice-l10n-lv,
- libreoffice-l10n-mk,
- libreoffice-l10n-ml,
- libreoffice-l10n-mn,
- libreoffice-l10n-mr,
- libreoffice-l10n-nb,
- libreoffice-l10n-ne,
- libreoffice-l10n-nr,
- libreoffice-l10n-nso,
- libreoffice-l10n-oc,
- libreoffice-l10n-om,
- libreoffice-l10n-or,
- libreoffice-l10n-pa-in,
- libreoffice-l10n-pl,
- libreoffice-l10n-pt,
- libreoffice-l10n-ro,
- libreoffice-l10n-rw,
- libreoffice-l10n-si,
- libreoffice-l10n-sk,
- libreoffice-l10n-sl,
- libreoffice-l10n-sr,
- libreoffice-l10n-ss,
- libreoffice-l10n-st,
- libreoffice-l10n-ta,
- libreoffice-l10n-te,
- libreoffice-l10n-tg,
- libreoffice-l10n-th,
- libreoffice-l10n-tn,
- libreoffice-l10n-tr,
- libreoffice-l10n-ts,
- libreoffice-l10n-ug,
- libreoffice-l10n-uk,
- libreoffice-l10n-uz,
- libreoffice-l10n-ve,
- libreoffice-l10n-vi,
- libreoffice-l10n-xh,
- libreoffice-l10n-za,
- libreoffice-l10n-zh-cn,
- libreoffice-l10n-zh-tw,
- libreoffice-l10n-zu,
Recommends:
mythes-ca,
@@ -216,6 +115,7 @@ Recommends:
Recommends:
thunderbird,
NeedConfig: yes - Cache, Printerapp, proxy server
+
Recommends:
thunderbird-l10n-ca,
thunderbird-l10n-de,
@@ -243,12 +143,11 @@ NeedConfig: yes - kdm and kde need to be configured to use it.
Recommends:
gnupg,
gnupg-agent,
-Avoid:
- pgp,
Recommends:
avahi-daemon,
libnss-mdns,
+
Suggests:
avahi-discover,
mdns-scan,
@@ -265,8 +164,6 @@ Recommends:
Recommends:
isc-dhcp-client,
-Avoid:
- pump,
Recommends:
freerdp2-x11 | rdesktop
@@ -355,6 +252,7 @@ Recommends:
myspell-pt-br,
hunspell-ru,
hunspell-sv-se,
+
Suggests:
hunspell-de-at,
hunspell-de-ch,
=====================================
tasks/desktop-xfce
=====================================
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -42,9 +42,11 @@ Recommends:
education-music,
education-physics,
education-misc,
+
Suggests:
education-primaryschool,
education-development,
+ education-video,
Recommends:
kdeedu,
=====================================
tasks/electronics
=====================================
--- a/tasks/electronics
+++ b/tasks/electronics
@@ -14,6 +14,7 @@ Recommends:
oregano,
xoscope,
gnucap,
+
Suggests:
kicad,
kicad-doc-en,
=====================================
tasks/geography
=====================================
--- a/tasks/geography
+++ b/tasks/geography
@@ -12,6 +12,7 @@ Recommends:
Recommends:
kgeography,
marble,
+
Suggests:
gpscorrelate,
qlandkartegt,
=====================================
tasks/laptop
=====================================
--- a/tasks/laptop
+++ b/tasks/laptop
@@ -12,6 +12,7 @@ Recommends:
Recommends:
bluedevil,
+
Suggests:
bluez-cups,
bluez,
=====================================
tasks/ltsp-server
=====================================
--- a/tasks/ltsp-server
+++ b/tasks/ltsp-server
@@ -39,6 +39,7 @@ Recommends:
Recommends:
pulseaudio,
pulseaudio-utils,
+
Suggests:
libpulse-mainloop-glib0,
=====================================
tasks/main-server
=====================================
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -15,6 +15,7 @@ Recommends:
Recommends:
avahi-daemon,
libnss-mdns,
+
Suggests:
avahi-discover,
mdns-scan,
@@ -22,6 +23,7 @@ Suggests:
Recommends:
bind9
+
Suggests:
nslint,
dnswalk,
@@ -52,6 +54,7 @@ NeedConfig: yes - generate certificates for ssl/tls support
Recommends:
dovecot-imapd,
+
Suggests:
dovecot-pop3d,
NeedConfig: yes - configure POP3/IMAP server
@@ -81,12 +84,14 @@ NeedConfig: yes - specify which directories to distribute and configure samba to
Recommends:
apache2,
+
Suggests:
apache2-doc,
webalizer,
Recommends:
squid,
+
Suggests:
calamaris,
squidguard,
@@ -118,6 +123,7 @@ NeedConfig: yes - done via preseeding: icingaadmin password, enable cgi.
Recommends:
sitesummary,
+
Suggests:
ocsinventory-server,
ocsinventory-reports,
=====================================
tasks/mathematics
=====================================
--- a/tasks/mathematics
+++ b/tasks/mathematics
@@ -25,6 +25,7 @@ Recommends:
xmabacus,
cantor,
jfractionlab,
+
Suggests:
octave,
rkward,
=====================================
tasks/misc
=====================================
--- a/tasks/misc
+++ b/tasks/misc
@@ -12,11 +12,13 @@ Recommends:
Recommends:
tilp2,
pysycache,
+
Suggests:
blinken,
Recommends:
vym,
+
Suggests:
freeplane,
=====================================
tasks/music
=====================================
--- a/tasks/music
+++ b/tasks/music
@@ -23,6 +23,7 @@ Recommends:
gtick,
lingot,
pianobooster,
+
Suggests:
lilypond,
festival,
=====================================
tasks/networked-common
=====================================
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -24,6 +24,7 @@ NeedConfig: yes - configure /etc/ldap/ldap.conf
Recommends:
ntpdate,
ntp,
+
Suggests:
ntp-doc,
NeedConfig: yes - set NTP server (client: ntp.local, server: ntp.extern)
@@ -54,6 +55,7 @@ NeedConfig: yes - configured by sitesummary-client preseeding.
Recommends:
sitesummary-client,
+
Suggests:
ocsinventory-agent,
NeedConfig: yes - specify URL to collector
@@ -70,12 +72,14 @@ NeedConfig: yes
Recommends:
openssh-server,
+
Suggests:
fail2ban,
NeedConfig: yes - enable X login etc
Recommends:
shutdown-at-night,
+
Recommends:
nvram-wakeup,
NeedConfig: yes - enable wake-on-lan sending based on sitesummary information.
=====================================
tasks/thin-client
=====================================
--- a/tasks/thin-client
+++ b/tasks/thin-client
@@ -9,6 +9,7 @@ Recommends:
ltsp-client,
iputils-ping,
iptables,
+
Recommends:
alsa-utils,
acpi-support-base,
=====================================
tasks/video
=====================================
--- a/tasks/video
+++ b/tasks/video
@@ -19,6 +19,7 @@ Recommends:
Recommends:
ffmpeg,
+
Suggests:
kino,
pitivi,
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/6f6c9e41baf01aabd1657fd36c0ae354d9cde73a...dd49db3f0d19c7020df49e224ae1f044acefa12f
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/6f6c9e41baf01aabd1657fd36c0ae354d9cde73a...dd49db3f0d19c7020df49e224ae1f044acefa12f
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/20180810/c03da365/attachment-0001.html>
More information about the debian-edu-commits
mailing list