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-10 03:11:50.000000000 +0000 +++ live-build-3.0~a24/debian/changelog 2012-08-23 16:06:58.000000000 +0000 @@ -1,3 +1,9 @@ +live-build (3.0~a24-1ubuntu32.5) precise-proposed; urgency=low + + * Remove Portugese langpack on amd64 ubuntu desktop image. + + -- Stéphane Graber Thu, 23 Aug 2012 12:06:38 -0400 + live-build (3.0~a24-1ubuntu32.4) precise-proposed; urgency=low * Remove German langpack on i386 ubuntu desktop image. (LP: #1035164) diff -Nru live-build-3.0~a24/debian/patches/series live-build-3.0~a24/debian/patches/series --- live-build-3.0~a24/debian/patches/series 2012-08-09 22:06:41.000000000 +0000 +++ live-build-3.0~a24/debian/patches/series 2012-08-23 16:09:16.000000000 +0000 @@ -23,4 +23,4 @@ ubuntu-kernel-img-conf.patch ubuntu-chroot_headers_tidy.patch ubuntu-remove-non-release-lists.patch -ubuntu-hack-remove-german-langpack.patch +ubuntu-hack-remove-langpacks.patch diff -Nru live-build-3.0~a24/debian/patches/ubuntu-hack-remove-german-langpack.patch live-build-3.0~a24/debian/patches/ubuntu-hack-remove-german-langpack.patch --- live-build-3.0~a24/debian/patches/ubuntu-hack-remove-german-langpack.patch 2012-08-10 03:16:53.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-hack-remove-german-langpack.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Description: Hack to remove the German langpack from 12.04.1 desktop i386 -Author: Stéphane Graber -Origin: vendor -Last-Update: 2012-08-09 - -Index: live-build-3.0~a24/scripts/build/lb_chroot_hacks -=================================================================== ---- live-build-3.0~a24.orig/scripts/build/lb_chroot_hacks 2012-08-09 18:06:41.000000000 -0400 -+++ live-build-3.0~a24/scripts/build/lb_chroot_hacks 2012-08-09 23:16:51.226911255 -0400 -@@ -239,6 +239,12 @@ - # 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. -+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" -+fi -+ - # Remove cruft - rm -f chroot/boot/initrd*bak* - rm -f chroot/etc/apt/trusted.gpg~ 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 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-hack-remove-langpacks.patch 2012-08-23 16:09:34.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Hack to remove the langpacks from 12.04.1 images +Author: Stéphane Graber +Origin: vendor +Last-Update: 2012-08-09 + +Index: live-build-3.0~a24/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 @@ + # 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. ++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" ++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" ++fi ++ + # Remove cruft + rm -f chroot/boot/initrd*bak* + rm -f chroot/etc/apt/trusted.gpg~