Hi again, On Mi 18 Jun 2025 11:51:19 CEST, Ivo De Decker wrote:
I suggest you do the upload with the minor changes to unstable, so they can migratie fairly soon. Please remove the moreinfo tag from this bug once you think it's ready.
Attached is the .debdiff between 2.13.0 and 2.13.2. Mike -- mike gabriel aka sunweaver (Debian Developer) mobile: +49 (1520) 1976 148 landline: +49 (4351) 486 14 27 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: sunweaver@debian.org, http://sunweavers.net
diff -Nru debian-edu-2.13.0/debian/changelog debian-edu-2.13.2/debian/changelog
--- debian-edu-2.13.0/debian/changelog 2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.2/debian/changelog 2025-06-27 22:12:18.000000000 +0200
@@ -1,3 +1,37 @@
+debian-edu (2.13.2) unstable; urgency=medium
+
+ * debian/control:
+ + Update file via 'make dist' applying the following changes:
+ Workstations:
+ - lxde: Replace network-manager-gnome by network-manager-applet.
+ - lxqt: Add network-manager-applet.
+ Main server:
+ - Add icinga2-ido-mysql (previously installed via cfengine3 during
+ main-server post-installation scripts)
+ (This should have gone into previous upload, but I forgot).
+
+ -- Mike Gabriel <sunweaver@debian.org> Fri, 27 Jun 2025 22:12:18 +0200
+
+debian-edu (2.13.1) unstable; urgency=medium
+
+ * tasks/desktop-lxqt:
+ - Add network-manager-applet. In Debian Edu, we use nm-applet in LxQt, not
+ connman.
+ * tasks/desktop-lxde:
+ - Replace network-manager-gnome (transitional package) with network-manager-
+ applet.
+ * tasks/main-server:
+ - Add icinga2-ido-mysql. In Debian 12, this was pulled in via the cfengine3
+ post-install cf.icinga script. In Debian 13, we need to install this
+ before cfengin3 scripts are run.
+ * sources.list.trixie:
+ - Add file. Assure that packages targetting trixie are honoured by Debian
+ Pure Blends scripts.
+ * debian/copyright:
+ + Update copyright attributions.
+
+ -- Mike Gabriel <sunweaver@debian.org> Fri, 27 Jun 2025 22:09:26 +0200
+
debian-edu (2.13.0) unstable; urgency=medium
* tasks/main-server: As timeserver, use ntpsec instead of old ntp.
diff -Nru debian-edu-2.13.0/debian/control debian-edu-2.13.2/debian/control
--- debian-edu-2.13.0/debian/control 2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.2/debian/control 2025-06-27 22:10:53.000000000 +0200
@@ -254,7 +254,7 @@
hexchat,
kdeedu,
mtpaint,
- network-manager-gnome,
+ network-manager-applet,
osmo,
pidgin,
ssh-askpass,
@@ -288,6 +288,7 @@
kdeedu,
lightdm,
mtpaint,
+ network-manager-applet,
osmo,
pidgin,
task-lxqt-desktop
@@ -705,6 +706,7 @@
hp-ppd,
hpijs-ppds,
icinga2,
+ icinga2-ido-mysql,
icingaweb2,
iptables,
ipxe,
diff -Nru debian-edu-2.13.0/debian/copyright debian-edu-2.13.2/debian/copyright
--- debian-edu-2.13.0/debian/copyright 2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.2/debian/copyright 2025-06-27 22:08:08.000000000 +0200
@@ -57,6 +57,7 @@
menus/applications-merged/video.menu
sources.list.bookworm
sources.list.bullseye
+ sources.list.trixie
sources.list.README
sources.list.stable
sources.list.unstable
@@ -99,7 +100,7 @@
Copyright: 2001, Raphael Hertzog <hertzog@debian.org>
2001-2018, Petter Reinholdtsen <pere@hungry.com>
2006-2023, Holger Levsen <holger@layer-acht.org>
- 2011-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+ 2011-2025, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
2013-2021, Wolfgang Schweer <w.schweer@gmx.de>
License: GPL-2+
diff -Nru debian-edu-2.13.0/sources.list.trixie debian-edu-2.13.2/sources.list.trixie
--- debian-edu-2.13.0/sources.list.trixie 1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-2.13.2/sources.list.trixie 2025-06-12 00:10:51.000000000 +0200
@@ -0,0 +1,2 @@
+# Use trixie as final target for Debian Edu metapackages
+deb http://deb.debian.org/debian/ trixie main contrib non-free
diff -Nru debian-edu-2.13.0/tasks/desktop-lxde debian-edu-2.13.2/tasks/desktop-lxde
--- debian-edu-2.13.0/tasks/desktop-lxde 2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.2/tasks/desktop-lxde 2025-06-12 00:10:51.000000000 +0200
@@ -14,7 +14,7 @@
task-lxde-desktop,
Recommends:
- network-manager-gnome,
+ network-manager-applet,
osmo,
pidgin,
hexchat,
diff -Nru debian-edu-2.13.0/tasks/desktop-lxqt debian-edu-2.13.2/tasks/desktop-lxqt
--- debian-edu-2.13.0/tasks/desktop-lxqt 2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.2/tasks/desktop-lxqt 2025-06-12 00:10:51.000000000 +0200
@@ -16,6 +16,7 @@
Recommends:
galculator,
+ network-manager-applet,
osmo,
pidgin,
mtpaint,
diff -Nru debian-edu-2.13.0/tasks/main-server debian-edu-2.13.2/tasks/main-server
--- debian-edu-2.13.0/tasks/main-server 2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.2/tasks/main-server 2025-06-12 00:10:51.000000000 +0200
@@ -116,6 +116,7 @@
Recommends:
icinga2,
+ icinga2-ido-mysql,
icingaweb2,
mariadb-server,
monitoring-plugins-standard,
Attachment:
pgp8JgBvQPfDc.pgp
Description: Digitale PGP-Signatur