[SCM] live-build branch, debian-next, updated. debian/3.0_a33-1-8-g88c0f89

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 88c0f8909be4ebe8d93635f484232921e328ca82
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 30 12:04:33 2011 +0200

    Colin Watson <cjwatson at ubuntu.com>
    
    Copying gfxboot theme when building for Ubuntu.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 8fbdee6..da69b28 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -53,6 +53,12 @@ case "${LB_BUILD_WITH_CHROOT}" in
 		Check_package chroot/usr/bin/syslinux syslinux
 		Check_package chroot/usr/share/syslinux/themes/${LB_SYSLINUX_THEME} syslinux-themes-${LB_SYSLINUX_THEME}
 
+		case "${LB_MODE}" in
+			ubuntu)
+				Check_package chroot/usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz gfxboot-theme-ubuntu
+				;;
+		esac
+
 		# Restoring cache
 		Restore_cache cache/packages_binary
 
@@ -86,12 +92,25 @@ case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
 		Chroot chroot "cp -aL /usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live /root/tmp"
+
+		case "${LB_MODE}" in
+			ubuntu)
+				Chroot chroot "tar xfz /usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz -C /root/tmp"
+				;;
+		esac
+
 		mv chroot/root/tmp/* ${_SUFFIX}
 		rmdir chroot/root/tmp
 		;;
 
 	false)
 		cp -aL /usr/share/syslinux/themes/${LB_SYSLINUX_THEME}/${_BOOTLOADER}-live/* ${_SUFFIX}
+
+		case "${LB_MODE}" in
+			ubuntu)
+				tar xfz /usr/share/gfxboot-theme-ubuntu/bootlogo.tar.gz -C ${_SUFFIX}
+				;;
+		esac
 		;;
 esac
 

-- 
live-build