Import patches-unapplied version 0.92 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 96da636da0

New changelog entries:
  * 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

.bzr/README

@@ -0,0 +1,3 @@
+This is a Bazaar control directory.
+Do not change any files in this directory.
+See http://bazaar-vcs.org/ for more information about Bazaar.

.bzr/branch-format

@@ -0,0 +1 @@
+Bazaar-NG meta directory, format 1

.bzr/branch/branch.conf

@@ -0,0 +1,2 @@
+parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
+push_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/

.bzr/branch/format

@@ -0,0 +1 @@
+Bazaar Branch Format 6 (bzr 0.15)

.bzr/branch/last-revision

@@ -0,0 +1 @@
+276 ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs39

.bzr/branch/tags

@@ -0,0 +1 @@
+d4:0.6854:cjwatson@canonical.com-20080922105353-5g6nbd3z6auod9o84:0.6947:ogra@ubuntu.com-20080923105752-3is4oq7h0rvr7m1t4:0.7050:stevenk@ubuntu.com-20080926061032-4cmvys3uwn0urof64:0.7147:ogra@ubuntu.com-20080929212513-932wmh9jhu2254c84:0.7254:cjwatson@canonical.com-20081009012107-bcithv5mtfr13wdr4:0.7350:superm1@ubuntu.com-20081105013351-lgows8lwl8gynab14:0.7450:superm1@ubuntu.com-20081108155125-k9hgpa9dpccasza14:0.7550:stevenk@ubuntu.com-20090110000926-kti0aa3w3gm87tl64:0.7654:cjwatson@canonical.com-20090120234103-0oedx9z8fwfgebmg4:0.7754:cjwatson@canonical.com-20090129172302-12n6za4eg8ti5iqs4:0.7850:stevenk@ubuntu.com-20090323105302-bzrig75pk422ae8o4:0.7954:cjwatson@canonical.com-20090403000814-c0f4i899uyvq3le14:0.8050:stevenk@ubuntu.com-20090416104708-ytmlukba1r2qbok24:0.8154:cjwatson@canonical.com-20090508233530-xqdymqe6ii8eanbt4:0.8254:cjwatson@canonical.com-20090529072059-0303r4t3a2terv5u4:0.8354:cjwatson@canonical.com-20090529093922-h2qylvtfqgwqocs24:0.8460:steve.langasek@canonical.com-20090610202236-hzpkmw79nuly34iu4:0.8554:cjwatson@canonical.com-20090623163248-2e75g8ph1wr63bck4:0.8650:stevenk@ubuntu.com-20090630021433-f32fyu1qvauh1y5y4:0.8754:cjwatson@canonical.com-20090707120821-n7o4gmu5cgvs76314:0.8850:superm1@ubuntu.com-20090723080906-su6zimlrtqy6bmdj4:0.8950:stevenk@ubuntu.com-20090805132344-m6jy87gv6cmus3384:0.9047:ogra@ubuntu.com-20090811090144-eek0pgpf01i0zjim4:0.9150:superm1@ubuntu.com-20090814032033-i87zsm015fivhf494:0.9247:ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs39e

.bzr/checkout/conflicts

@@ -0,0 +1 @@
+BZR conflict list format 1

.bzr/checkout/format

@@ -0,0 +1 @@
+Bazaar Working Tree Format 4 (bzr 0.15)

.bzr/checkout/merge-hashes

@@ -0,0 +1,6 @@
+BZR merge-modified list format 1
+file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
+hash: 64a8ca3d9f969fe6ccff917739be2dbaf85af2d3
+
+file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
+hash: 723d11f776ba3507bac97fd386d7ffaa8a43de7c

.bzr/repository/format

@@ -0,0 +1 @@
+Bazaar pack repository format 1 (needs bzr 0.92)

.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.six

@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (0.92) karmic; 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 ]

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