Bug#1035894: unblock: desktop-base/12.0.6

[Aurélien COUDERC <coucouf@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: desktop-base@packages.debian.org, debian-desktop@lists.debian.org
Control: affects -1 + src:desktop-base

Dear Release Team,

please unblock package desktop-base.

[ Reason ]
It fixes a bug where Pymouth messages and prompts don’t get displayed
for some screen size and ratio combinations.

[ Impact ]
- Users won’t see the password prompt for LUKS encrypted volumes on boot
  in certain screen configurations. (#1032412)
- The « remove media press enter to reboot » message isn’t shown after
  initial installation.

[ Tests ]
I tested that there are no regression on single screen use cases and
both the original reporter and a second person confirmed the fix on
their multi-screen / multi-ratio configurations.

[ Risks ]
No risk identified, the patch is small and localised the new code
underwent more tests in more configurations that the one currently in
testing.

[ 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 ]
Thanks for your work on the release !

unblock desktop-base/12.0.6

diff -Nru desktop-base-12.0.5/debian/changelog desktop-base-12.0.6/debian/changelog
--- desktop-base-12.0.5/debian/changelog	2023-03-01 23:22:32.000000000 +0100
+++ desktop-base-12.0.6/debian/changelog	2023-04-13 21:58:23.000000000 +0200
@@ -1,3 +1,10 @@
+desktop-base (12.0.6) unstable; urgency=medium
+
+  * Fix LUKS password not being shown in multi-screen setup with mixed aspect
+    ratios.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Thu, 13 Apr 2023 21:58:23 +0200
+
 desktop-base (12.0.5) unstable; urgency=medium
 
   * Make the GDM Debian footer slightly smaller.
diff -Nru desktop-base-12.0.5/emerald-theme/plymouth/emerald.script desktop-base-12.0.6/emerald-theme/plymouth/emerald.script
--- desktop-base-12.0.5/emerald-theme/plymouth/emerald.script	2023-03-01 23:01:49.000000000 +0100
+++ desktop-base-12.0.6/emerald-theme/plymouth/emerald.script	2023-04-13 21:58:23.000000000 +0200
@@ -119,7 +119,8 @@
     #Debug("y = " + y);
 
     text_height = first_line_height * 7.5;
-    min_height = window_max.height - 2 * first_line_height;
+    # subtract Window.GetY() to show info also at smallest of dual srceens
+    min_height = window_max.height - 2 * first_line_height - Window.GetY();
     #Debug("text_height=" + text_height + "; min_height=" + min_height);
 
     if (y + text_height > min_height)
@@ -131,8 +132,8 @@
 
 #----------------------------- Screen/window setup ---------------------------
 # Compute screen/image ratio and scale the background accordingly
-window_max.width = Window.GetX() * 2 + Window.GetWidth();
-window_max.height = Window.GetY() * 2 + Window.GetHeight();
+window_max.width = Window.GetWidth();
+window_max.height = Window.GetHeight();
 screen_ratio = window_max.width / window_max.height;
 small_dimension = Math.Min(window_max.width, window_max.height);
 #Debug("Window.GetX():" + Window.GetX() + ", Window.GetY():" + Window.GetY());