diff -Nru live-build-3.0~a24/debian/changelog live-build-3.0~a24/debian/changelog --- live-build-3.0~a24/debian/changelog 2012-08-23 16:06:58.000000000 +0000 +++ live-build-3.0~a24/debian/changelog 2013-01-22 11:00:37.000000000 +0000 @@ -1,3 +1,10 @@ +live-build (3.0~a24-1ubuntu32.6) precise; urgency=low + + * Remove Portuguese langpack from i386 Ubuntu desktop image, and Spanish + from amd64 (LP: #1102929). + + -- Colin Watson Tue, 22 Jan 2013 11:00:19 +0000 + live-build (3.0~a24-1ubuntu32.5) precise-proposed; urgency=low * Remove Portugese langpack on amd64 ubuntu desktop image. diff -Nru live-build-3.0~a24/debian/patches/ubuntu-hack-remove-langpacks.patch live-build-3.0~a24/debian/patches/ubuntu-hack-remove-langpacks.patch --- live-build-3.0~a24/debian/patches/ubuntu-hack-remove-langpacks.patch 2012-08-23 16:09:34.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-hack-remove-langpacks.patch 2013-01-22 10:53:53.000000000 +0000 @@ -3,21 +3,23 @@ Origin: vendor Last-Update: 2012-08-09 -Index: live-build-3.0~a24/scripts/build/lb_chroot_hacks +Index: b/scripts/build/lb_chroot_hacks =================================================================== ---- live-build-3.0~a24.orig/scripts/build/lb_chroot_hacks 2012-08-23 12:01:21.000000000 -0400 -+++ live-build-3.0~a24/scripts/build/lb_chroot_hacks 2012-08-23 12:06:35.427788789 -0400 -@@ -239,6 +239,15 @@ +--- a/scripts/build/lb_chroot_hacks ++++ b/scripts/build/lb_chroot_hacks +@@ -239,6 +239,17 @@ # Remove build systems clock drift echo "0.0 0 0.0" > chroot/etc/adjtime -+# Hack to remove the german langpacks from the i386 ubuntu desktop live image -+# this is 12.04.1-specific and shouldn't be carried forward. ++# Hack to remove some language packs from Ubuntu desktop live images; ++# this is 12.04.*-specific and shouldn't be carried forward. +if [ "${LB_ARCHITECTURES}" = "i386" ] && [ "${PROJECT}" = "ubuntu" ]; then + Chroot chroot "apt-get remove --purge -y language-pack-de-base firefox-locale-de" || Echo_warning "Unable to find German langpack on image so can't remove it" ++ Chroot chroot "apt-get remove --purge -y language-pack-pt-base firefox-locale-pt" || Echo_warning "Unable to find Portuguese langpack on image so can't remove it" +fi +if [ "${LB_ARCHITECTURES}" = "amd64" ] && [ "${PROJECT}" = "ubuntu" ]; then -+ Chroot chroot "apt-get remove --purge -y language-pack-pt-base firefox-locale-pt" || Echo_warning "Unable to find Portugese langpack on image so can't remove it" ++ Chroot chroot "apt-get remove --purge -y language-pack-pt-base firefox-locale-pt" || Echo_warning "Unable to find Portuguese langpack on image so can't remove it" ++ Chroot chroot "apt-get remove --purge -y language-pack-es-base firefox-locale-es" || Echo_warning "Unable to find Spanish langpack on image so can't remove it" +fi + # Remove cruft