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

Re: [Pkg-fonts-devel] Bug#707765: Acknowledgement (plymouth: Missing text on passphrase input screen)



Control: tag -1 +patch

On mar., 2013-05-14 at 12:37 +0200, Yves-Alexis Perez wrote:
> The hook only copy the symlink which is then dangling and removed by
> the update-initramfs command later. So the hook needs to be updated in
> plymouth and a Breaks should be added to fonts-dejavu. 

Attached patch seems to fix the problem.

Regards,
-- 
Yves-Alexis
From 68fa96a301ce242c12ce97d8c086e2c3813b7932 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Tue, 14 May 2013 12:51:21 +0200
Subject: [PATCH] Fix fonts path in initramfs hook

---
 debian/local/plymouth.hook |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 debian/local/plymouth.hook

diff --git a/debian/local/plymouth.hook b/debian/local/plymouth.hook
old mode 100644
new mode 100755
index 9d0f677..5253971
--- a/debian/local/plymouth.hook
+++ b/debian/local/plymouth.hook
@@ -90,22 +90,22 @@ case "${THEME_NAME}" in
 		cp /usr/share/plymouth/debian-logo.png "${DESTDIR}/usr/share/plymouth"
 
 		# copy files for font rendering
-		mkdir -p "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
+		mkdir -p "${DESTDIR}/usr/share/fonts/truetype/dejavu"
 		mkdir -p "${DESTDIR}/etc/fonts/conf.d"
 		mkdir -p "${DESTDIR}/var/cache/fontconfig"
-		cp -a /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
-		cp -a /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf  "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
+		cp -a /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/truetype/dejavu"
+		cp -a /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf  "${DESTDIR}/usr/share/fonts/truetype/dejavu"
 		cp -a /etc/fonts/fonts.conf "${DESTDIR}/etc/fonts"
 		cp -rL /etc/fonts/conf.d/60-latin.conf "${DESTDIR}/etc/fonts/conf.d"
 
-		mkdir -p "${DESTDIR}/usr/lib/@DEB_HOST_MULTIARCH@/pango/1.6.0/module-files.d"
-		mkdir -p "${DESTDIR}/usr/lib/@DEB_HOST_MULTIARCH@/pango/1.6.0/modules"
-		cp /usr/lib/@DEB_HOST_MULTIARCH@/pango/1.6.0/module-files.d/libpango1.0-0.modules ${DESTDIR}/usr/lib/@DEB_HOST_MULTIARCH@/pango/1.6.0/module-files.d/
-		copy_exec /usr/lib/@DEB_HOST_MULTIARCH@/pango/1.6.0/modules/pango-basic-fc.so
+		mkdir -p "${DESTDIR}/usr/lib/x86_64-linux-gnu/pango/1.6.0/module-files.d"
+		mkdir -p "${DESTDIR}/usr/lib/x86_64-linux-gnu/pango/1.6.0/modules"
+		cp /usr/lib/x86_64-linux-gnu/pango/1.6.0/module-files.d/libpango1.0-0.modules ${DESTDIR}/usr/lib/x86_64-linux-gnu/pango/1.6.0/module-files.d/
+		copy_exec /usr/lib/x86_64-linux-gnu/pango/1.6.0/modules/pango-basic-fc.so
 
 		# copy renderers
-		copy_exec /usr/lib/@DEB_HOST_MULTIARCH@/plymouth/renderers/frame-buffer.so
-		copy_exec /usr/lib/@DEB_HOST_MULTIARCH@/plymouth/renderers/drm.so
+		copy_exec /usr/lib/x86_64-linux-gnu/plymouth/renderers/frame-buffer.so
+		copy_exec /usr/lib/x86_64-linux-gnu/plymouth/renderers/drm.so
 
 		# add drm modules
 		copy_modules_dir kernel/drivers/gpu/drm mga r128 savage sis tdfx via
@@ -133,7 +133,7 @@ then
 	echo "passwd: files" >> "${DESTDIR}/etc/nsswitch.conf"
 fi
 
-for _LIBRARY in /lib/@DEB_HOST_MULTIARCH@/libnss_files*
+for _LIBRARY in /lib/x86_64-linux-gnu/libnss_files*
 do
 	if [ -e "${_LIBRARY}" ]
 	then
-- 
1.7.10.4

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: