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

Bug#985745: unblock: desktop-base/11.0.3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Debian Desktop Team <debian-desktop@lists.debian.org>

Please unblock package desktop-base

[ Reason ]
This last upload includes a couple of targeted fixes:
- Fix alternatives leftover after package uninstallation.
- Fix for unreadable GRUB text due to background color at some
  resolutions.
- Fix for Plymouth text display in multi-screen configurations for all
  other themes than bullseye’s homeworld theme (homeworld was fixed in
  the previous upload).
- Fix typo in bullseye theme metadata.

[ Impact ]
Users won’t get the above fixes.

[ Tests ]
I manually tested the fixes for all changes listed above.

[ Risks ]
The risk is very low: a couple of oneliners and some SVG image work.

[ 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 ]
I’m excluding the SVG diff of GRUB images from the debdiff as it adds a
lot of noise and not much readable information.

unblock desktop-base/11.0.3
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/debian/changelog desktop-base-11.0.3/debian/changelog
--- desktop-base-11.0.2/debian/changelog	2021-03-02 00:37:18.000000000 +0100
+++ desktop-base-11.0.3/debian/changelog	2021-03-21 22:35:17.000000000 +0100
@@ -1,3 +1,16 @@
+desktop-base (11.0.3) unstable; urgency=medium
+
+  * Make Debian logo and text darker on GRUB backgrounds to avoid grub’s own
+    text being unreadable on top of these. (Closes: #983884)
+  * Also remove futurePrototype alternative for desktop-theme in prerm
+    maintainer script. (Closes: #985267)
+  * Fix Name metadata for homeworld theme’s wallpaper.
+  * Also fix plymouth text display in multi-screen configurations for previous
+    themes: futureprototype, joy, lines, moonlight, softwaves (fixes more
+    cases of #956426).
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 21 Mar 2021 22:35:17 +0100
+
 desktop-base (11.0.2) unstable; urgency=medium
 
   [ Holger Levsen ]
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/debian/prerm desktop-base-11.0.3/debian/prerm
--- desktop-base-11.0.2/debian/prerm	2021-03-01 21:46:50.000000000 +0100
+++ desktop-base-11.0.3/debian/prerm	2021-03-18 13:45:17.000000000 +0100
@@ -182,8 +182,9 @@
             desktop-theme \
             /usr/share/desktop-base/$theme-theme
     done << EOF
-softwaves
+futureprototype
 moonlight
+softwaves
 lines
 joy
 joy-inksplat
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/futureprototype-theme/plymouth/futureprototype.script desktop-base-11.0.3/futureprototype-theme/plymouth/futureprototype.script
--- desktop-base-11.0.2/futureprototype-theme/plymouth/futureprototype.script	2020-11-16 23:06:27.000000000 +0100
+++ desktop-base-11.0.3/futureprototype-theme/plymouth/futureprototype.script	2021-03-21 15:05:41.000000000 +0100
@@ -119,7 +119,7 @@
     #Debug("y = " + y);
 
     text_height = first_line_height * 7.5;
-    min_height = Window.GetHeight();
+    min_height = window_max.height;
     #Debug("text_height=" + text_height + "; min_height=" + min_height);
 
     if (y + text_height > min_height)
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/homeworld-theme/wallpaper/metadata.desktop desktop-base-11.0.3/homeworld-theme/wallpaper/metadata.desktop
--- desktop-base-11.0.2/homeworld-theme/wallpaper/metadata.desktop	2021-03-01 21:46:50.000000000 +0100
+++ desktop-base-11.0.3/homeworld-theme/wallpaper/metadata.desktop	2021-03-18 13:38:20.000000000 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=futurePrototype
+Name=Homeworld
 X-KDE-PluginInfo-Name=Homeworld
 X-KDE-PluginInfo-Author=Juliet Taka
 X-KDE-PluginInfo-Email=juliettetaka.belin@gmail.com
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/joy-theme/plymouth/joy.script desktop-base-11.0.3/joy-theme/plymouth/joy.script
--- desktop-base-11.0.2/joy-theme/plymouth/joy.script	2020-11-16 23:06:27.000000000 +0100
+++ desktop-base-11.0.3/joy-theme/plymouth/joy.script	2021-03-21 15:05:41.000000000 +0100
@@ -114,7 +114,7 @@
 
     text_height = first_line_height * 7.5;
 
-    min_height = Window.GetHeight();
+    min_height = window_max.height;
     if (y + text_height > min_height)
         y = min_height - text_height;
 
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/lines-theme/plymouth/lines.script desktop-base-11.0.3/lines-theme/plymouth/lines.script
--- desktop-base-11.0.2/lines-theme/plymouth/lines.script	2020-11-16 23:06:27.000000000 +0100
+++ desktop-base-11.0.3/lines-theme/plymouth/lines.script	2021-03-21 15:05:41.000000000 +0100
@@ -210,7 +210,7 @@
 
     text_height = first_line_height * 7.5;
 
-    min_height = Window.GetHeight();
+    min_height = window_max.height;
     if (y + text_height > min_height)
         y = min_height - text_height;
 
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/moonlight-theme/plymouth/moonlight.script desktop-base-11.0.3/moonlight-theme/plymouth/moonlight.script
--- desktop-base-11.0.2/moonlight-theme/plymouth/moonlight.script	2020-11-16 23:06:27.000000000 +0100
+++ desktop-base-11.0.3/moonlight-theme/plymouth/moonlight.script	2021-03-21 15:05:41.000000000 +0100
@@ -125,7 +125,7 @@
     #Debug("y = " + y);
 
     text_height = first_line_height * 7.5;
-    min_height = Window.GetHeight();
+    min_height = window_max.height;
     #Debug("text_height=" + text_height + "; min_height=" + min_height);
 
     if (y + text_height > min_height)
diff -Nru --exclude grub-16x9.svg --exclude grub-4x3.svg desktop-base-11.0.2/softwaves-theme/plymouth/softwaves.script desktop-base-11.0.3/softwaves-theme/plymouth/softwaves.script
--- desktop-base-11.0.2/softwaves-theme/plymouth/softwaves.script	2020-11-16 23:06:27.000000000 +0100
+++ desktop-base-11.0.3/softwaves-theme/plymouth/softwaves.script	2021-03-21 15:05:41.000000000 +0100
@@ -118,7 +118,7 @@
     #Debug("y = " + y);
 
     text_height = first_line_height * 7.5;
-    min_height = Window.GetHeight();
+    min_height = window_max.height;
     #Debug("text_height=" + text_height + "; min_height=" + min_height);
 
     if (y + text_height > min_height)

Reply to: