[debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] 3 commits: Revert "debian/update-debian-edu-artwork: Stop checking if this is a Debian Edu system."

[Mike Gabriel (@sunweaver)]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-artwork


Commits:
ebf6b657 by Mike Gabriel at 2023-12-09T07:55:20+01:00
Revert "debian/update-debian-edu-artwork: Stop checking if this is a Debian Edu system."

Closes: #1057815
See also: #856789

This reverts commit 65703345dd7a400c3f4d548ae037f63253a4f1a2.

- - - - -
068e8c80 by Mike Gabriel at 2023-12-09T08:00:29+01:00
debian/update-debian-edu-artwork: Add comment to never introduce this regression again.

- - - - -
efec297a by Mike Gabriel at 2023-12-09T08:00:58+01:00
release as 2.12.3-3

- - - - -


2 changed files:

- debian/changelog
- debian/update-debian-edu-artwork


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+debian-edu-artwork (2.12.3-3) unstable; urgency=medium
+
+  * Revert "debian/update-debian-edu-artwork: Stop checking if this is a Debian
+    Edu system." (Closes: #1057815, see also: #856789)
+  * debian/update-debian-edu-artwork: Add comment to never introduce this
+    regression again.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Sat, 09 Dec 2023 08:00:36 +0100
+
 debian-edu-artwork (2.12.3-2) unstable; urgency=medium
 
   [ Guido Berhoerster ]


=====================================
debian/update-debian-edu-artwork
=====================================
@@ -93,7 +93,10 @@ restore_desktop_background() {
 
 ## Plymouth
 set_plymouth_theme() {
-    if [ -f /etc/plymouth/plymouthd.conf ] && command -v plymouth-set-default-theme > /dev/null ; then
+    # The check whether we are on a Debian Edu system is vital for this part of
+    # the script being compliant with Debian policy. Never remove that check!
+    # See: #1057815 and #856789.
+    if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] && command -v plymouth-set-default-theme > /dev/null ; then
         plymouth-set-default-theme -R debian-edu-${edutheme} || true
     fi
 }



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/compare/265f244b56139bb7e90063386965433b7e6f4466...efec297af41ebebd9a423a2f7b0821f6cc9da7fc

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/compare/265f244b56139bb7e90063386965433b7e6f4466...efec297af41ebebd9a423a2f7b0821f6cc9da7fc
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/20231209/1a1df3fc/attachment-0001.htm>