Bug#1112312: trixie-pu: Pre-approval: package desktop-base/13.0.4

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

Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: desktop-base@packages.debian.org
Control: affects -1 + src:desktop-base
User: release.debian.org@packages.debian.org
Usertags: pu

Dear Stable Release Managers.

[ Reason ]
I’d like to fix the following bug in trixie:
  Bug#1110858: ceratopsian-theme: plymouth password/fsck prompts
  off-center on multi-monitor mixed-resolution set-ups

[ Impact ]
While I’m not sure the original bug qualifies as severity "important"
it’s still a highly visible issue right from the boot for people having
a multi-monitor setup and using disk encryption.

[ Tests ]
- The same fix was tested against unstable both for single and
multi-monitor setups, and the fix backported to a trixie branch.
- The package targetting trixie was tested for non-regression in a
  trixie VM (with a single screen).

[ Risks ]
The fix is made of 4 simple one-liners, with the new calculation being
even simpler than the original code. I could reproduce the issue and
confirm the fix. So I consider the risk to be very low.

[ 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 (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
* Fix ceratopsian-theme’s plymouth password/fsck prompts off-center on
  multi-monitor mixed-resolution set-ups. Thanks Shaun Lewis for the patch.
  (Closes: #1110858)


Thanks !
--
Aurélien

diff -Nru desktop-base-13.0.3/ceratopsian-theme/plymouth/ceratopsian.script desktop-base-13.0.4/ceratopsian-theme/plymouth/ceratopsian.script
--- desktop-base-13.0.3/ceratopsian-theme/plymouth/ceratopsian.script	2025-05-23 11:26:01.000000000 +0200
+++ desktop-base-13.0.4/ceratopsian-theme/plymouth/ceratopsian.script	2025-08-28 13:32:12.000000000 +0200
@@ -330,7 +330,7 @@
     message_label.height = message_image.GetHeight ();
 
     # Center the line horizontally
-    message_label.x = Window.GetX () + Window.GetWidth () / 2 - message_label.width / 2;
+    message_label.x = (Window.GetWidth () - message_label.width) / 2;
 
     message_label.y = top_of_the_text;
 
@@ -365,7 +365,7 @@
     fsck_label.height = fsck_label.image.GetHeight ();
 
     # Centre the label horizontally
-    fsck_label.x = Window.GetX () + Window.GetWidth () / 2 - fsck_label.width / 2;
+    fsck_label.x = (Window.GetWidth () - fsck_label.width) / 2;
 
     local.first_label = get_message_label (label, 1, 0);
 
@@ -482,7 +482,7 @@
     entry.sprite.SetImage (entry.image);
 
     # Centre the box horizontally
-    entry.x = Window.GetX () + Window.GetWidth () / 2 - entry.image.GetWidth () / 2;
+    entry.x = (Window.GetWidth () - entry.image.GetWidth ()) / 2;
 
     # Put the entry below the second label.
     entry.y = message_notification[2].y + label.height * 1.5;
@@ -530,7 +530,7 @@
     spaces = Math.Int( (password_dialogue.entry.image.GetWidth () - (margin * 2)) / (bullet_width / 2 ) );
     #DebugMedium ("spaces = " + spaces + ", bullets = " + bullets);
     bullets_area.width = margin + spaces * (bullet_width / 2);
-    bullets_area.x = Window.GetX () + Window.GetWidth () / 2 - bullets_area.width / 2;
+    bullets_area.x = (Window.GetWidth () - bullets_area.width) / 2;
     #DebugBottom ("pwd_entry (x,y) = " + password_dialogue.entry.x + "," + password_dialogue.entry.y
     #             + "), bullets_area.x = " + bullets_area.x + ", bullets_area.width = " + bullets_area.width);
     if (bullets > spaces)
diff -Nru desktop-base-13.0.3/debian/changelog desktop-base-13.0.4/debian/changelog
--- desktop-base-13.0.3/debian/changelog	2025-05-30 14:30:31.000000000 +0200
+++ desktop-base-13.0.4/debian/changelog	2025-08-28 13:33:06.000000000 +0200
@@ -1,3 +1,12 @@
+desktop-base (13.0.4) trixie; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * Fix ceratopsian-theme’s plymouth password/fsck prompts off-center on
+    multi-monitor mixed-resolution set-ups. Thanks Shaun Lewis for the patch.
+    (Closes: #1110858)
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Thu, 28 Aug 2025 13:33:06 +0200
+
 desktop-base (13.0.3) unstable; urgency=medium
 
   * Fix incongruous black background in logo-text.svg and