Your message dated Wed, 24 Mar 2021 20:33:44 +0000
with message-id <[email protected]>
and subject line unblock plymouth
has caused the Debian Bug report #985761,
regarding unblock: plymouth/0.9.5-3
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
985761: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=985761
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
X-Debbugs-Cc: [email protected]
Please unblock package plymouth
So apparently I forgot to ask for an unblock my last upload of plymouth
[ Reason ]
The main change is the switch to the new "homeworld" theme
The other changes are:
- Removing a dependency against a package removed from the archive
(ttf-dejavu-core)
- Remove the support for /etc/vconsole.conf that is not used anywhere in
debian.
[ Impact ]
Plymouth uses the old theme from Buster
[ Tests ]
Reboot and the new theme is displayed.
The keymap is still read properly from /etc/default/keyboard
[ Risks ]
NA
[ 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
unblock plymouth/0.9.5-3
diff -Nru plymouth-0.9.5/debian/changelog plymouth-0.9.5/debian/changelog
--- plymouth-0.9.5/debian/changelog 2020-12-09 15:58:50.000000000 +0100
+++ plymouth-0.9.5/debian/changelog 2021-03-02 13:18:12.000000000 +0100
@@ -1,3 +1,15 @@
+plymouth (0.9.5-3) unstable; urgency=medium
+
+ [ Laurent Bigonville ]
+ * debian/control: Remove dependency the ttf-dejavu-core alternative
+ * Don't use /etc/vconsole.conf after all as it's not used anywhere in debian
+ * d/p/0003-default-theme.patch: Switch to homeworld for bullseye
+
+ [ Simon McVittie ]
+ * Unfuzz 0008-show-delay.patch to apply cleanly
+
+ -- Laurent Bigonville <[email protected]> Tue, 02 Mar 2021 13:18:12 +0100
+
plymouth (0.9.5-2) unstable; urgency=medium
* debian/local/plymouth.hook: Copy logo-text-version-64.png in the initramfs
diff -Nru plymouth-0.9.5/debian/control plymouth-0.9.5/debian/control
--- plymouth-0.9.5/debian/control 2020-12-09 15:58:50.000000000 +0100
+++ plymouth-0.9.5/debian/control 2021-03-02 13:18:12.000000000 +0100
@@ -110,7 +110,7 @@
Depends: fontconfig,
fontconfig-config,
fonts-cantarell,
- fonts-dejavu-core | ttf-dejavu-core,
+ fonts-dejavu-core,
plymouth (= ${binary:Version}),
plymouth-label (= ${binary:Version}),
${misc:Depends},
diff -Nru plymouth-0.9.5/debian/local/plymouth.hook
plymouth-0.9.5/debian/local/plymouth.hook
--- plymouth-0.9.5/debian/local/plymouth.hook 2020-12-09 15:58:50.000000000
+0100
+++ plymouth-0.9.5/debian/local/plymouth.hook 2021-03-02 13:18:12.000000000
+0100
@@ -121,17 +121,12 @@
esac
fc-cache -s -y "${DESTDIR}" > /dev/null 2>&1
- # copy /etc/default/keyboard and /etc/vconsole.conf (needed for
keymap detection)
+ # copy /etc/default/keyboard (needed for keymap detection)
if [ -e /etc/default/keyboard ]
then
mkdir -p "${DESTDIR}/etc/default"
cp /etc/default/keyboard "${DESTDIR}/etc/default"
fi
- if [ -e /etc/vconsole.conf ]
- then
- mkdir -p "${DESTDIR}/etc"
- cp /etc/vconsole.conf "${DESTDIR}/etc"
- fi
# for two-step
case "$(sed -n 's/^ModuleName=\(.*\)/\1/p' ${THEME})" in
diff -Nru plymouth-0.9.5/debian/patches/0003-default-theme.patch
plymouth-0.9.5/debian/patches/0003-default-theme.patch
--- plymouth-0.9.5/debian/patches/0003-default-theme.patch 2020-12-09
15:58:50.000000000 +0100
+++ plymouth-0.9.5/debian/patches/0003-default-theme.patch 2021-03-02
13:18:12.000000000 +0100
@@ -7,7 +7,7 @@
# Administrator customizations go in this file
#[Daemon]
-#Theme=fade-in
-+#Theme=futureprototype
++#Theme=homeworld
--- a/src/plymouthd.defaults
+++ b/src/plymouthd.defaults
@@ -1,6 +1,6 @@
@@ -15,6 +15,6 @@
# upgrades.
[Daemon]
-Theme=spinner
-+Theme=futureprototype
++Theme=homeworld
ShowDelay=0
DeviceTimeout=8
diff -Nru plymouth-0.9.5/debian/patches/0008-show-delay.patch
plymouth-0.9.5/debian/patches/0008-show-delay.patch
--- plymouth-0.9.5/debian/patches/0008-show-delay.patch 2020-12-09
15:58:50.000000000 +0100
+++ plymouth-0.9.5/debian/patches/0008-show-delay.patch 2021-03-02
13:18:12.000000000 +0100
@@ -6,5 +6,5 @@
@@ -1,3 +1,4 @@
# Administrator customizations go in this file
#[Daemon]
- #Theme=futureprototype
+ #Theme=homeworld
+#ShowDelay=0
diff -Nru plymouth-0.9.5/debian/patches/fallback-etc-default-keyboard.patch
plymouth-0.9.5/debian/patches/fallback-etc-default-keyboard.patch
--- plymouth-0.9.5/debian/patches/fallback-etc-default-keyboard.patch
2020-12-09 15:58:50.000000000 +0100
+++ plymouth-0.9.5/debian/patches/fallback-etc-default-keyboard.patch
2021-03-02 13:18:12.000000000 +0100
@@ -1,17 +1,17 @@
+Description: Use /etc/default/keyboard instead of /etc/vconsole.conf
+Forwarded: not-needed
+
--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
-@@ -136,6 +136,14 @@ ply_terminal_parse_keymap_conf (ply_term
- keymap = ply_key_file_get_value (vconsole_conf, NULL,
"KEYMAP");
+@@ -131,9 +131,9 @@ ply_terminal_parse_keymap_conf (ply_term
+ if (keymap)
+ return keymap;
+
+- vconsole_conf = ply_key_file_new ("/etc/vconsole.conf");
++ vconsole_conf = ply_key_file_new ("/etc/default/keyboard");
+ if (ply_key_file_load_groupless_file (vconsole_conf))
+- keymap = ply_key_file_get_value (vconsole_conf, NULL,
"KEYMAP");
++ keymap = ply_key_file_get_value (vconsole_conf, NULL,
"XKBLAYOUT");
ply_key_file_free (vconsole_conf);
-+ /* Fallback to the debian specific keyboard configuration file */
-+ if (!keymap) {
-+ vconsole_conf = ply_key_file_new ("/etc/default/keyboard");
-+ if (ply_key_file_load_groupless_file (vconsole_conf))
-+ keymap = ply_key_file_get_value (vconsole_conf, NULL,
"XKBLAYOUT");
-+ ply_key_file_free (vconsole_conf);
-+ }
-+
/* The keymap name in vconsole.conf might be quoted, strip these */
- if (keymap && keymap[0] == '"' && keymap[strlen (keymap) - 1] == '"')
{
- old_keymap = keymap;
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
