From 5e9195a1b15bdff0dc9424d8140e4156ba0deedf Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 21 Aug 2009 19:37:57 +0200
Subject: [PATCH] armel+imx51 back to the proper metapackage name, enable
 universe for armel+dove, drop armel fallback, clean some trailing whitespace
 in the armel subarch case statement

---
 debian/changelog |  9 +++++++++
 livecd.sh        | 13 ++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed764638..664e3700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (0.92) UNRELEASED; urgency=low
+
+  * change armel+imx51 back to the proper metapackage name
+  * enable universe for armel+dove build
+  * drop armel fallback, we want to fail officially if no armel subarch is set
+  * clean some trailing whitespace in the armel subarch case statement
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 21 Aug 2009 19:33:15 +0200
+
 livecd-rootfs (0.91) karmic; urgency=low
 
   [ Steve Kowalik ]
diff --git a/livecd.sh b/livecd.sh
index be441658..62fe22f4 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -325,15 +325,18 @@ link_in_boot = $link_in_boot
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;
 	sparc*)		LIST="$LIST linux-sparc64";;
-	armel)	
-			case "$SUBARCH" in 
+	armel)
+			case "$SUBARCH" in
 				imx51)
-					LIST="$LIST linux-babbage"
+					LIST="$LIST linux-imx51"
+					# temporarily enable universe until kernel is in main
+					COMP="main restricted universe"
+					;;
+				dove)
+					LIST="$LIST linux-dove"
 					# temporarily enable universe until kernel is in main
 					COMP="main restricted universe"
 					;;
-				dove)	LIST="$LIST linux-dove";;
-				*)	LIST="$LIST linux-babbage";;
 			esac;;
 	*)		echo "Unknown architecture: no kernel."; exit 1;;
     esac