replace kubuntu-mobile with kubuntu-active

BuildLiveCD

@@ -76,9 +76,9 @@ if [ "$new_suite" = "yes" ] && [ "$old_suite" = "yes" ]; then
     exit 1
 fi
 if ([ $# = 0 ] || [ "X$1" = "Xall" ]) && ! $LIVE_BUILD; then
-    set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu base
+    set -- ubuntu kubuntu kubuntu-active edubuntu xubuntu mythbuntu base
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
+        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-active edubuntu edubuntu-dvd xubuntu mythbuntu base
     fi
 fi
 
@@ -89,7 +89,7 @@ esac
 
 for arg in "$@"; do
     case "$arg" in
-	*ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|ubuntustudio-dvd|base|tocd|ubuntu-headless|ubuntu-server|ubuntu-core|cloud-live)	;;
+	*ubuntu|*ubuntu-dvd|kubuntu-active|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|ubuntustudio-dvd|base|tocd|ubuntu-headless|ubuntu-server|ubuntu-core|cloud-live)	;;
 	*)
 	    echo "bad project: $arg" >&2
 	    exit 2

debian/changelog

@@ -3,7 +3,11 @@ livecd-rootfs (2.56) UNRELEASED; urgency=low
   [ Ante Karamatić ]
   * Add cloud-live project to livecd.sh and BuildLiveCD.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Fri, 17 Feb 2012 15:36:14 +0000
+  [ Jonathan Riddell ]
+  * Replace kubuntu-mobile with kubuntu-active
+  * Remove kubuntu-netbook, now just part of kubuntu-desktop
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 22 Feb 2012 11:58:20 +0000
 
 livecd-rootfs (2.55) precise; urgency=low
 

live-build/auto/config

@@ -129,9 +129,9 @@ case $PROJECT in
 		LIVE_TASK='kubuntu-live'
 		;;
 
-	kubuntu-mobile)
-		add_task install minimal standard kubuntu-mobile
-		LIVE_TASK='kubuntu-mobile-live'
+	kubuntu-active)
+		add_task install minimal standard kubuntu-active
+		LIVE_TASK='kubuntu-active-live'
 		COMPONENTS='main restricted universe'
 		;;
 
@@ -269,7 +269,7 @@ fi
 ln -s /usr/share/live/build/examples/hooks/all_chroot_pyc-purge.sh config/chroot_local-hooks/
 
 case $PROJECT in
-	kubuntu|kubuntu-mobile)
+	kubuntu|kubuntu-active)
 		ln -s /usr/share/live/build/examples/hooks/kubuntu_chroot_icon-theme.sh config/chroot_local-hooks/
 		;;
 esac
@@ -320,8 +320,8 @@ if [ "$PREINSTALLED" = "true" ]; then
 	if [ -n "$PREINSTALL_POOL_SEEDS" ]; then
 		rm -rf germinate-output && mkdir germinate-output
 		case $PROJECT in
-			kubuntu-mobile*)
-				SEED=kubuntu-mobile.$SUITE
+			kubuntu-active*)
+				SEED=kubuntu-active.$SUITE
 				;;
 			kubuntu*)
 				SEED=kubuntu.$SUITE

livecd.sh

@@ -211,9 +211,9 @@ esac; done;
 shift $((OPTIND-1))
 
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
-    set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base ubuntu-headless cloud-live
+    set -- ubuntu kubuntu kubuntu-active edubuntu xubuntu mythbuntu gobuntu base ubuntu-headless cloud-live
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless
+        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-active edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless
     fi
 fi
 
@@ -225,7 +225,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-       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|ubuntu-headless|tocd|cloud-live)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-active|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|ubuntu-headless|tocd|cloud-live)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -278,15 +278,11 @@ 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="kubuntu-mobile-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
+	kubuntu-active)
+	    LIST="$LIST minimal^ standard^ kubuntu-active^"
+	    LIVELIST="kubuntu-active-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    COMP="main restricted universe"
 	    ;;
-	kubuntu-netbook)
-	    LIST="$LIST minimal^ standard^ kubuntu-netbook^"
-	    LIVELIST="kubuntu-netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
-	    ;;
 	edubuntu|edubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^"
 	    LIVELIST="edubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
@@ -739,8 +735,7 @@ Pin-Priority: 550
 
     # No point keeping Gnome icon cache around for Kubuntu
     if [ "$FS" = "kubuntu" ] || \
-       [ "$FS" = "kubuntu-netbook" ] || \
-       [ "$FS" = "kubuntu-mobile" ]; then
+       [ "$FS" = "kubuntu-active" ]; then
         rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache
     fi