Merge lp:~jr/ubuntu-cdimage/kubuntu-active into lp:~cjwatson/ubuntu-cdimage/mainline

[Jonathan Riddell]

[Scott Kitterman (kitterman)]

Looks good to me based on what I remember.

Unmerged revisions

884. By Jonathan Riddell on 2012-02-22

replace kubuntu-mobile with kubuntu-active

=== modified file 'bin/build-image-set'
--- bin/build-image-set	2011-06-24 09:40:28 +0000
+++ bin/build-image-set	2012-02-22 12:21:24 +0000
@@ -77,7 +77,7 @@
 			export CDIMAGE_UNSUPPORTED=1
 		fi
 		;;
-	kubuntu-kde4|kubuntu-netbook|kubuntu-mobile)
+	kubuntu-active)
 		export CDIMAGE_UNSUPPORTED=1
 		;;
 	ubuntustudio)

=== modified file 'bin/download-live-filesystems'
--- bin/download-live-filesystems	2012-01-20 21:04:10 +0000
+++ bin/download-live-filesystems	2012-02-22 12:21:24 +0000
@@ -62,7 +62,7 @@
 
 		if [ "$PROJECT" != livecd-base ] && \
 		   ([ "$PROJECT" != edubuntu ] || dist_ge precise) && \
-		   [ "$PROJECT" != kubuntu-mobile ]; then
+		   [ "$PROJECT" != kubuntu-active ]; then
 			if dist_le feisty; then
 				:
 			elif dist_le intrepid; then

=== modified file 'bin/for-project'
--- bin/for-project	2011-06-24 09:40:28 +0000
+++ bin/for-project	2012-02-22 12:21:24 +0000
@@ -12,17 +12,9 @@
 		export PROJECT=kubuntu
 		export CAPPROJECT=Kubuntu
 		;;
-	kubuntu-kde4)
-		export PROJECT=kubuntu-kde4
-		export CAPPROJECT=Kubuntu-KDE4
-		;;
-	kubuntu-netbook)
-		export PROJECT=kubuntu-netbook
-		export CAPPROJECT=Kubuntu-Netbook
-		;;
-	kubuntu-mobile)
-		export PROJECT=kubuntu-mobile
-		export CAPPROJECT=Kubuntu-Mobile
+	kubuntu-active)
+		export PROJECT=kubuntu-active
+		export CAPPROJECT=Kubuntu-Active
 		;;
 	edubuntu)
 		export PROJECT=edubuntu
@@ -74,9 +66,7 @@
 Recognised projects:
   ubuntu
   kubuntu
-  kubuntu-kde4
-  kubuntu-netbook
-  kubuntu-mobile
+  kubuntu-active
   edubuntu
   xubuntu
   gobuntu

=== modified file 'bin/list-seeds'
--- bin/list-seeds	2012-01-23 22:17:33 +0000
+++ bin/list-seeds	2012-02-22 12:21:24 +0000
@@ -54,8 +54,8 @@
 					SHIP=server-ship
 				fi
 				;;
-			kubuntu-mobile)
-				SHIP=mobile-ship
+			kubuntu-active)
+				SHIP=active-ship
 				;;
 		esac
 		inheritance "$SHIP"
@@ -100,11 +100,8 @@
 		;;
 	ship-live)
 		case $PROJECT in
-			kubuntu-netbook)
-				echo 'ship-netbook-live'
-				;;
-			kubuntu-mobile)
-				echo 'ship-mobile-live'
+			kubuntu-active)
+				echo 'ship-active-live'
 				;;
 			*)
 				if dist_ge dapper; then

=== modified file 'bin/make-web-indices'
--- bin/make-web-indices	2012-02-09 23:32:34 +0000
+++ bin/make-web-indices	2012-02-22 12:21:24 +0000
@@ -103,8 +103,8 @@
 		netbook)
 			echo "netbook live $CD"
 			;;
-		mobile)
-			echo "preview mobile image"
+		active)
+			echo "preview active image"
 			;;
 		*)
 			echo "Unknown CD type $1!" >&2
@@ -230,10 +230,10 @@
 at least ${DESKTOP_RAM}MiB of RAM to install from this $CD.</p>
 EOF
 			;;
-		mobile)
+		active)
 			# Kubuntu only
 			cat <<EOF
-<p>The Mobile Image offers a preview of the Plasma Mobile workspace to try or
+<p>The Active Image offers a preview of the Plasma Active workspace to try or
 install.</p>
 EOF
 			;;

=== modified file 'bin/publish-daily'
--- bin/publish-daily	2012-02-01 12:02:06 +0000
+++ bin/publish-daily	2012-02-22 12:21:24 +0000
@@ -40,8 +40,8 @@
 					TYPE=desktop
 				fi
 				;;
-			kubuntu-mobile)
-				TYPE=mobile
+			kubuntu-active)
+				TYPE=active
 				;;
 			ubuntu-server)
 				TYPE=live

=== modified file 'bin/run-germinate'
--- bin/run-germinate	2012-01-30 17:25:32 +0000
+++ bin/run-germinate	2012-02-22 12:21:24 +0000
@@ -29,7 +29,7 @@
 if [ "$GERMINATE_BZR" ]; then
 	SEED_SOURCE=http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/
 	case $PROJECT in
-		kubuntu|kubuntu-mobile)
+		kubuntu|kubuntu-active)
 			if dist_ge oneiric; then
 				SEED_SOURCE="http://bazaar.launchpad.net/~kubuntu-dev/ubuntu-seeds/,$SEED_SOURCE"
 			fi
@@ -75,8 +75,8 @@
 	ubuntu-netbook)
 		GERMINATE_SEED_DIST="netbook.$DIST"
 		;;
-	kubuntu-mobile)
-		GERMINATE_SEED_DIST="kubuntu-mobile.$DIST"
+	kubuntu-active)
+		GERMINATE_SEED_DIST="kubuntu-active.$DIST"
 		;;
 	*)
 		GERMINATE_SEED_DIST="$PROJECT.$DIST"

=== modified file 'bin/site-manifest'
--- bin/site-manifest	2011-10-19 16:24:30 +0000
+++ bin/site-manifest	2012-02-22 12:21:24 +0000
@@ -20,7 +20,7 @@
 
 file_to_manifest () {
 	case $file in
-		kubuntu/*|edubuntu/*|xubuntu/*|gobuntu/*|ubuntu-server/*|jeos/*|ubuntu-netbook/*|kubuntu-netbook/*|kubuntu-mobile/*|mythbuntu/*|ubuntustudio/*|lubuntu/*)
+		kubuntu/*|edubuntu/*|xubuntu/*|gobuntu/*|ubuntu-server/*|jeos/*|ubuntu-netbook/*|kubuntu-active/*|mythbuntu/*|ubuntustudio/*|lubuntu/*)
 			project="${file%%/*}"
 			;;
 		tocd*)

=== modified file 'etc/config'
--- etc/config	2011-10-31 10:31:28 +0000
+++ etc/config	2012-02-22 12:21:24 +0000
@@ -24,7 +24,7 @@
 # All projects currently being built.  This is used for building source
 # images.  Note that we only need to include projects with their own seed
 # collections, so not ubuntu-server.
-ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu kubuntu-mobile edubuntu xubuntu ubuntustudio mythbuntu}"
+ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu kubuntu-active edubuntu xubuntu ubuntustudio mythbuntu}"
 
 if [ -z "$ARCHES" ]; then
 	ARCHES="$(default-arches "$PROJECT" "$IMAGE_TYPE" "$DIST")"