Package: plymouth Version: 0.8.3-18 Severity: important Tags: wheezy sid patch User: ubuntu-de...@lists.ubuntu.com Usertags: ubuntu-patch origin-ubuntu oneiric
Hi Daniel, One of the consequences of the multiarch transition currently rolling through unstable is that any package which accesses libraries by path will need to cope with that path changing. One instance of this which was encountered already when starting this conversion in Ubuntu is the plymouth initramfs hook script, which needs to copy pango modules into the initramfs. The attached patch from Ubuntu should allow the plymouth package to work correctly with pango, both before and after pango transitions for multiarch. Note that the copy_exec calls for the shared libraries have been dropped entirely - copy_exec resolves library dependencies on its own, so the only copy_exec calls needed are for top-level binaries (executables, plugins) that are referenced directly. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/changelog' --- debian/changelog 2010-11-20 16:27:22 +0000 +++ debian/changelog 2011-07-18 07:51:31 +0000 @@ -1,3 +1,12 @@ +plymouth (0.8.3-18.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * debian/local/plymouth.hook: handle multiarch paths for pango modules. + * Build-depend on dpkg-dev (>= 1.16.0) so we can check the multiarch path + at build time. + + -- Steve Langasek <steve.langa...@ubuntu.com> Mon, 18 Jul 2011 00:39:22 -0700 + plymouth (0.8.3-18) unstable; urgency=low * Switching to source format 3.0 (quilt). === modified file 'debian/control' --- debian/control 2010-11-20 16:27:22 +0000 +++ debian/control 2011-07-18 07:39:03 +0000 @@ -5,7 +5,7 @@ Uploaders: Daniel Baumann <dan...@debian.org> Build-Depends: debhelper (>= 8), autotools-dev, libdrm-dev, libgtk2.0-dev, libpango1.0-dev, - libpng-dev, pkg-config + libpng-dev, pkg-config, dpkg-dev (>= 1.16.0) Standards-Version: 3.9.1 Homepage: http://www.freedesktop.org/wiki/Software/Plymouth Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/plymouth.git === modified file 'debian/local/plymouth.hook' --- debian/local/plymouth.hook 2010-10-07 08:15:17 +0000 +++ debian/local/plymouth.hook 2011-07-18 07:50:34 +0000 @@ -76,18 +76,22 @@ # copy files for font rendering mkdir -p "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu" - mkdir -p "${DESTDIR}/usr/lib/pango/1.6.0/modules" 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 /etc/fonts/fonts.conf "${DESTDIR}/etc/fonts" cp -rL /etc/fonts/conf.d/60-latin.conf "${DESTDIR}/etc/fonts/conf.d" - copy_exec /usr/lib/pango/1.6.0/modules/pango-basic-fc.so - copy_exec /usr/lib/pango/1.6.0/module-files.d/libpango1.0-0.modules - copy_exec /usr/lib/libpango-1.0.so.0 - copy_exec /usr/lib/libpangoft2-1.0.so.0 - copy_exec /usr/lib/libpangocairo-1.0.so.0 + if [ -e /usr/lib/pango/1.6.0/module-files.d/libpango1.0-0.modules ]; then + # pre-multiarch fallback + PANGO_DIR=/usr/lib/pango/1.6.0 + else + PANGO_DIR=/usr/lib/#DEB_HOST_MULTIARCH#/pango/1.6.0 + fi + mkdir -p "${DESTDIR}${PANGO_DIR}/module-files.d" + mkdir -p "${DESTDIR}${PANGO_DIR}/modules" + cp ${PANGO_DIR}/module-files.d/libpango1.0-0.modules ${DESTDIR}${PANGO_DIR}/module-files.d/ + copy_exec ${PANGO_DIR}/modules/pango-basic-fc.so # copy renderers copy_exec /usr/lib/plymouth/renderers/frame-buffer.so === modified file 'debian/rules' --- debian/rules 2010-11-20 16:27:22 +0000 +++ debian/rules 2011-07-18 07:40:47 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh ${@} @@ -31,6 +33,8 @@ # Adding initramfs-tools integration install -D -m 0755 debian/local/plymouth.hook debian/plymouth/usr/share/initramfs-tools/hooks/plymouth + sed -i -e's/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/g' \ + debian/plymouth/usr/share/initramfs-tools/hooks/plymouth install -D -m 0755 debian/local/plymouth.init-premount debian/plymouth/usr/share/initramfs-tools/scripts/init-premount/plymouth install -D -m 0755 debian/local/plymouth.init-bottom debian/plymouth/usr/share/initramfs-tools/scripts/init-bottom/plymouth
signature.asc
Description: Digital signature
