[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#988902: unblock: debian-edu-artwork-legacy/20201210-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-edu@lists.debian.org

Please unblock package debian-edu-artwork-legacy

Unfortunately, I did two consecutive uploads as I failed to run git-pull
before implementing my changes.

+debian-edu-artwork-legacy (20201210-3) unstable; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Clean up obsolete ldm-theme alternative on upgrades. (Closes: #986562)
+
+  [ Wolfgang Schweer ]
+  * Make sure the Plymouth theme is restored to the Debian default one in case
+    the debian-edu-artwork-spacefun package is removed.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 20 May 2021 22:35:53 +0200
+
+debian-edu-artwork-legacy (20201210-2) unstable; urgency=medium
+
+  * debian/debian-edu-artwork-spacefun.links:
+
+    + Provide missing image login/background-nologo.svg. As background.svg
+      already comes without a logo, simply create a symlink from
+      background-nologo.svg to background.svg. (Closes: #988898).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 20 May 2021 22:25:53 +0200

The three changes above basically do these things:

  * improve clean-up on package removal
  * provide extra image file (symlink) background-nologo.svg in
    the desktop-base theme subfolder 'login/'.

[ Reason ]
Let Arctica Greeter (which uses background-nologo.svg in desktop-base)
have a background image when d-e-artwork-spacefun is used on the system.

[ Impact ]
Broken login background for LightDM's Arctica Greeter (arctica-greeter).

[ Tests ]
Manual tests on a Debian Edu system (new school notebooks, running Debian 11).

[ Risks ]
No real risks outside of the Debian Edu realm.

[ 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 ]
None

unblock debian-edu-artwork-legacy/20201210-3
diff -Nru debian-edu-artwork-legacy-20201210/debian/changelog debian-edu-artwork-legacy-20201210/debian/changelog
--- debian-edu-artwork-legacy-20201210/debian/changelog	2020-12-10 23:04:59.000000000 +0100
+++ debian-edu-artwork-legacy-20201210/debian/changelog	2021-05-20 22:35:53.000000000 +0200
@@ -1,3 +1,24 @@
+debian-edu-artwork-legacy (20201210-3) unstable; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Clean up obsolete ldm-theme alternative on upgrades. (Closes: #986562)
+
+  [ Wolfgang Schweer ]
+  * Make sure the Plymouth theme is restored to the Debian default one in case
+    the debian-edu-artwork-spacefun package is removed.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 20 May 2021 22:35:53 +0200
+
+debian-edu-artwork-legacy (20201210-2) unstable; urgency=medium
+
+  * debian/debian-edu-artwork-spacefun.links:
+
+    + Provide missing image login/background-nologo.svg. As background.svg
+      already comes without a logo, simply create a symlink from
+      background-nologo.svg to background.svg. (Closes: #988898).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 20 May 2021 22:25:53 +0200
+
 debian-edu-artwork-legacy (20201210-1) unstable; urgency=medium
 
   * art-spacefun/ldm:
diff -Nru debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.links debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.links
--- debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.links	2018-12-04 15:35:45.000000000 +0100
+++ debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.links	2021-05-20 22:34:50.000000000 +0200
@@ -1 +1,2 @@
 /usr/share/desktop-base/debian-edu-spacefun-theme/wallpaper /usr/share/desktop-base/debian-edu-spacefun-theme/lockscreen
+/usr/share/desktop-base/debian-edu-spacefun-theme/login/background.svg /usr/share/desktop-base/debian-edu-spacefun-theme/login/background-nologo.svg
diff -Nru debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.preinst debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.preinst
--- debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.preinst	1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-artwork-legacy-20201210/debian/debian-edu-artwork-spacefun.preinst	2021-05-20 22:34:50.000000000 +0200
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+#DEBHELPER#
+
+EDUTHEME="spacefun"
+
+if [ "$1" = "upgrade" ]; then
+	if dpkg --compare-versions "$2" lt-nl "20201210-2~" ; then
+		# no longer managed by update-debian-edu-artwork-$EDUTHEME
+		update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-$EDUTHEME
+	fi
+fi
diff -Nru debian-edu-artwork-legacy-20201210/debian/update-debian-edu-artwork-spacefun debian-edu-artwork-legacy-20201210/debian/update-debian-edu-artwork-spacefun
--- debian-edu-artwork-legacy-20201210/debian/update-debian-edu-artwork-spacefun	2020-12-10 23:04:59.000000000 +0100
+++ debian-edu-artwork-legacy-20201210/debian/update-debian-edu-artwork-spacefun	2021-05-20 22:34:50.000000000 +0200
@@ -114,6 +114,12 @@
     fi
 }
 
+restore_plymouth_theme() {
+    if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+        plymouth-set-default-theme -R -r || true
+    fi
+}
+
 ## Lockscreen
 set_lockscreen() {
     update-alternatives --install \
@@ -154,6 +160,7 @@
 		restore_grub_background
 		restore_desktop_background
 		compile_gschemas
+		restore_plymouth_theme
 		restore_lockscreen
 	;;
 esac

Reply to: