Rename Ubuntu Netbook Remix to Ubuntu Netbook.

BuildLiveCD

@@ -74,7 +74,7 @@ fi
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
     set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu base
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook-remix kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
+        set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
     fi
 fi
 
@@ -85,7 +85,7 @@ esac
 
 for arg in "$@"; do
     case "$arg" in
-	*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|ubuntu-moblin-remix|mythbuntu|base|tocd)	;;
+	*ubuntu|*ubuntu-dvd|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

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (1.104) UNRELEASED; urgency=low
+
+  * Rename Ubuntu Netbook Remix to Ubuntu Netbook.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 18 Dec 2009 14:16:26 +1100
+
 livecd-rootfs (1.103) lucid; urgency=low
 
   * make sure there is no old squashfs around before attempting to squash a

livecd.sh

@@ -146,7 +146,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-remix|ubuntu-moblin-remix|base|tocd)
+       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)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -211,9 +211,9 @@ Flags: seen
 	    LIVELIST="mobile-live^ casper ubiquity"
 	    COMP="main restricted universe multiverse"
 	    ;;
-	ubuntu-netbook-remix)
-	    LIST="$LIST minimal^ standard^ ubuntu-netbook-remix^"
-	    LIVELIST="unr-live^ laptop-detect casper lupin-casper"
+	ubuntu-netbook)
+	    LIST="$LIST minimal^ standard^ ubuntu-netbook^"
+	    LIVELIST="netbook-live^ laptop-detect casper lupin-casper"
 	    ;;
 	mythbuntu)
 	    LIST="$LIST minimal^ standard^ mythbuntu-desktop^"