From c7f1a3bbd973513dbe97b44b55b19981236118d4 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 23 Feb 2010 17:51:57 +0000 Subject: [PATCH] Import patches-unapplied version 1.106 to ubuntu/lucid Imported using git-ubuntu import. Changelog parent: 3302b839d5330d0d69155e41abc56d7e9daca90c New changelog entries: * Delete Gnome icon cache for Kubuntu images --- debian/changelog | 6 ++++++ livecd.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9c76061e..3dd8daa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (1.106) lucid; urgency=low + + * Delete Gnome icon cache for Kubuntu images + + -- Jonathan Riddell Tue, 23 Feb 2010 17:51:57 +0000 + livecd-rootfs (1.105) lucid; urgency=low * Edubuntu is allowed to pull from universe; update livecd.sh accordingly diff --git a/livecd.sh b/livecd.sh index 3002df2f..00f230f7 100755 --- a/livecd.sh +++ b/livecd.sh @@ -582,6 +582,12 @@ Pin-Priority: 550 powerpc+ps3) chroot ${ROOT} addgroup --system spu;; esac + + # No point keeping Gnome icon cache around for Kubuntu + if [ "$FS" = "kubuntu" || "$FS" = "kubuntu-netbook" ]; then + rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache + fi + # all done with the chroot; reset the debconf frontend, so Colin doesn't cry echo RESET debconf/frontend | chroot $ROOT debconf-communicate echo FSET debconf/frontend seen true | chroot $ROOT debconf-communicate