Bug#1106698: unblock: plymouth/24.004.60-5
Package: release.debian.org
Followup-For: Bug #1106698
I forgot the debdiff..
diff --git a/debian/changelog b/debian/changelog
index 3208709e..f7841429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plymouth (24.004.60-5) unstable; urgency=medium
+
+ * d/l/plymouth.hook: Avoid installing a font already present in the initramfs
+ (Closes: #1106115)
+
+ -- Laurent Bigonville <bigon@debian.org> Tue, 27 May 2025 10:45:42 +0200
+
plymouth (24.004.60-4) unstable; urgency=medium
* d/l/plymouth.hook: Do not explicitly install DejaVu fonts.
diff --git a/debian/local/plymouth.hook b/debian/local/plymouth.hook
index 7a645415..6a90c04a 100644
--- a/debian/local/plymouth.hook
+++ b/debian/local/plymouth.hook
@@ -105,9 +105,9 @@ case "${THEME_NAME}" in
# Fallback fonts
mkdir -p ${DESTDIR}/usr/share/fonts
DEFAULT_FONT=$(fc-match -f %{file} 2> /dev/null)
- [ ! -z "$DEFAULT_FONT" ] && copy_file font "$DEFAULT_FONT"
+ [ ! -z "$DEFAULT_FONT" -a ! -f "${DESTDIR}${DEFAULT_FONT}" ] && copy_file font "$DEFAULT_FONT"
DEFAULT_MONOSPACE_FONT=$(fc-match -f %{file} monospace 2> /dev/null)
- [ ! -z "$DEFAULT_MONOSPACE_FONT" ] && copy_file font "$DEFAULT_MONOSPACE_FONT"
+ [ ! -z "$DEFAULT_MONOSPACE_FONT" -a ! -f "${DESTDIR}${DEFAULT_MONOSPACE_FONT}" ] && copy_file font "$DEFAULT_MONOSPACE_FONT"
[ ! -z "$DEFAULT_FONT" ] && ln -s "$DEFAULT_FONT" ${DESTDIR}/usr/share/fonts/Plymouth.ttf
[ ! -z "$DEFAULT_MONOSPACE_FONT" ] && ln -s "$DEFAULT_MONOSPACE_FONT" ${DESTDIR}/usr/share/fonts/Plymouth-monospace.ttf
Reply to: