Bug#1107680: unblock: debian-edu/2.13.1 (pre-upload approval request)

Mike Gabriel <[email protected]> Thu, 12 Jun 2025 00:24:44 +0200

Newsgroups	gmane.linux.skolelinux.devel
Message-ID	<174968068482.95431.4473069948130097591.reportbug__15815.744809673$1749680867$gmane$org@sunobo.fritz.box>

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:debian-edu
User: [email protected]
Usertags: unblock

Please pre-upload approve unblocking package debian-edu

[ Reason ]
We would like to make Debian Edu aware of the Lomiri Operating
Environment, so we can offer Lomiri as a desktop environment on
Debian Edu systems.

This upload will also include further minor changes / fixes:
  * Reference network-manager-applet instead of network-manager-gnome.
  * Install required software by certain Debian Edu installation profiles
    via education-* package recommendations rather than via cfengine3
    scripts in debian-edu-config src:pkg (counterpart upload is in prep).
  * Add sources.list.trixie (required for ISO image generation and
    blends-dev scripts).

[ Impact ]
This unblock request is mainly about whether the release team
acknowledges the debian-edu upload via NEW to get
education-desktop-lomiri added to the set of bin:pkgs provided by
debian-edu src:pkg.

If this gets rejected, we can live with it, but it would be really nice
to provide a tablet capable shell (i.e. Lomiri) in Debian Edu.

If the Lomiri integration gets rejected, we will provide an alternative
2.13.1 upload only including the minor changes / fixes listed above.

[ Tests ]
None, except from building the package and checking the dependency changes.
(Normally, nothing else needs testing).

[ Risks ]
Nearly none, impact only on Debian Edu.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
Relevant for Debian Lomiri and Debian Edu.

unblock debian-edu/2.13.1

debian-edu_2.13.0_2.13.1.debdiff (text/plain, 6.9 KB)

diff -Nru debian-edu-2.13.0/debian/changelog debian-edu-2.13.1/debian/changelog
--- debian-edu-2.13.0/debian/changelog	2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.1/debian/changelog	2025-06-12 00:02:05.000000000 +0200
@@ -1,3 +1,34 @@
+debian-edu (2.13.1) unstable; urgency=medium
+
+  * tasks/desktop-lomiri:
+    - Add Lomiri Operating Environment to Debian Edu. This adds a new bin:pkg
+      to the debian-edu src:pkg.
+    - debian-edu-tasks.desc: Update file. Add education-desktop-lomiri task.
+  * 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.
+
+  * d/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.
+      - lomiri: Add Lomiri as a Debian Edu desktop environment.
+      Main server:
+      - Add icinga2-ido-mysql (previously installed via cfengine3 during
+        main-server post-installation scripts)
+  * d/copyright: Update copyright attributions.
+
+ -- Mike Gabriel <[email protected]>  Thu, 12 Jun 2025 00:02:05 +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.1/debian/control
--- debian-edu-2.13.0/debian/control	2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.1/debian/control	2025-06-12 00:02:05.000000000 +0200
@@ -233,6 +233,17 @@
  This metapackage depends on various KDE office and desktop applications
  that are useful for teachers and their students.
 
+Package: education-desktop-lomiri
+Architecture: any
+Depends: ${misc:Depends},
+         education-tasks (= ${binary:Version})
+Recommends: education-common,
+            lomiri
+Description: Debian Edu Lomiri for Tablets
+ This metapackage installs the Lomiri Operating Environment in a software
+ composition suitable for tablets as they may be useful for teachers and
+ their students.
+
 Package: education-desktop-lxde
 Architecture: any
 Depends: ${misc:Depends},
@@ -254,7 +265,7 @@
             hexchat,
             kdeedu,
             mtpaint,
-            network-manager-gnome,
+            network-manager-applet,
             osmo,
             pidgin,
             ssh-askpass,
@@ -288,6 +299,7 @@
             kdeedu,
             lightdm,
             mtpaint,
+            network-manager-applet,
             osmo,
             pidgin,
             task-lxqt-desktop
@@ -705,6 +717,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.1/debian/copyright
--- debian-edu-2.13.0/debian/copyright	2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.1/debian/copyright	2025-06-12 00:02:05.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
@@ -66,6 +67,7 @@
  tasks/desktop-cinnamon
  tasks/desktop-gnome
  tasks/desktop-kde
+ tasks/desktop-lomiri
  tasks/desktop-lxde
  tasks/desktop-lxqt
  tasks/desktop-mate
@@ -99,7 +101,7 @@
 Copyright: 2001, Raphael Hertzog <[email protected]>
   2001-2018, Petter Reinholdtsen <[email protected]>
   2006-2023, Holger Levsen <[email protected]>
-  2011-2018, Mike Gabriel <[email protected]>
+  2011-2025, Mike Gabriel <[email protected]>
   2013-2021, Wolfgang Schweer <[email protected]>
 License: GPL-2+
 
diff -Nru debian-edu-2.13.0/debian-edu-tasks.desc debian-edu-2.13.1/debian-edu-tasks.desc
--- debian-edu-2.13.0/debian-edu-tasks.desc	2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.1/debian-edu-tasks.desc	2025-06-12 00:02:05.000000000 +0200
@@ -31,6 +31,17 @@
 Key:
  education-desktop-kde
 
+Task: education-desktop-lomiri
+Section: debian-edu
+Description: Debian Edu Lomiri for Tablets
+ This metapackage installs the Lomiri Operating Environment in a software
+ composition suitable for tablets as they may be useful for teachers and
+ their students.
+Relevance: 10
+Test-edu-preferred-desktop: lomiri
+Key:
+ education-desktop-lomiri
+
 Task: education-desktop-lxde
 Section: debian-edu
 Description: Debian Edu LXDE desktop applications
diff -Nru debian-edu-2.13.0/sources.list.trixie debian-edu-2.13.1/sources.list.trixie
--- debian-edu-2.13.0/sources.list.trixie	1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-2.13.1/sources.list.trixie	2025-06-12 00:02:05.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-lomiri debian-edu-2.13.1/tasks/desktop-lomiri
--- debian-edu-2.13.0/tasks/desktop-lomiri	1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-2.13.1/tasks/desktop-lomiri	2025-06-12 00:02:05.000000000 +0200
@@ -0,0 +1,14 @@
+Format: https://blends.debian.org/blends/1.1
+Task: Lomiri
+Architecture: any
+Test-edu-preferred-desktop: lomiri
+Description: Debian Edu Lomiri for Tablets
+ This metapackage installs the Lomiri Operating Environment in a software
+ composition suitable for tablets as they may be useful for teachers and
+ their students.
+
+Recommends:
+ education-common,
+
+Recommends:
+ lomiri
diff -Nru debian-edu-2.13.0/tasks/desktop-lxde debian-edu-2.13.1/tasks/desktop-lxde
--- debian-edu-2.13.0/tasks/desktop-lxde	2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.1/tasks/desktop-lxde	2025-06-12 00:02:05.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.1/tasks/desktop-lxqt
--- debian-edu-2.13.0/tasks/desktop-lxqt	2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.1/tasks/desktop-lxqt	2025-06-12 00:02:05.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.1/tasks/main-server
--- debian-edu-2.13.0/tasks/main-server	2025-06-02 16:46:03.000000000 +0200
+++ debian-edu-2.13.1/tasks/main-server	2025-06-12 00:02:05.000000000 +0200
@@ -116,6 +116,7 @@
 
 Recommends:
  icinga2,
+ icinga2-ido-mysql,
  icingaweb2,
  mariadb-server,
  monitoring-plugins-standard,