From 94cb0caeba5c8f272dccdb9de448bdb10689896a Mon Sep 17 00:00:00 2001 From: Emmet Hikory Date: Thu, 26 Aug 2010 13:27:23 +0900 Subject: [PATCH] Add support for kubuntu-mobile --- BuildLiveCD | 6 +++--- debian/changelog | 6 ++++++ livecd.sh | 14 ++++++++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index 701af485..4b7cf2a0 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -69,9 +69,9 @@ if [ "$new_suite" = "yes" ] && [ "$old_suite" = "yes" ]; then exit 1 fi if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu base + set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base + set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base fi fi @@ -82,7 +82,7 @@ esac for arg in "$@"; do case "$arg" in - *ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd) ;; + *ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd) ;; *) echo "bad project: $arg" >&2 exit 2 diff --git a/debian/changelog b/debian/changelog index 9c640f82..916d1d54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (1.147) UNRELEASED; urgency=low + + * Add support for kubuntu-mobile + + -- Emmet Hikory Thu, 26 Aug 2010 13:26:21 +0900 + livecd-rootfs (1.146) maverick; urgency=low * Add a series of checkpoints where the current time is logged. diff --git a/livecd.sh b/livecd.sh index 8803f771..1fdd52d2 100755 --- a/livecd.sh +++ b/livecd.sh @@ -196,9 +196,9 @@ esac; done; shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base + set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base + set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base fi fi @@ -210,7 +210,7 @@ fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd) + ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd) ;; *) echo bad name >&2; @@ -258,6 +258,10 @@ Flags: seen LIST="$LIST minimal^ standard^ kubuntu-desktop^" LIVELIST="kubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS" ;; + kubuntu-mobile) + LIST="$LIST minimal^ standard^ kubuntu-mobile^" + LIVELIST="language-support-en kubuntu-mobile-live^ laptop-detect $LIVE_BOOT_SCRIPTS" + ;; kubuntu-netbook) LIST="$LIST minimal^ standard^ kubuntu-netbook^" LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS" @@ -686,7 +690,9 @@ Pin-Priority: 550 esac # No point keeping Gnome icon cache around for Kubuntu - if [ "$FS" = "kubuntu" ] || [ "$FS" = "kubuntu-netbook" ]; then + if [ "$FS" = "kubuntu" ] || \ + [ "$FS" = "kubuntu-netbook" ] || \ + [ "$FS" = "kubuntu-mobile"] ; then rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache fi