Import patches-unapplied version 0.36 to ubuntu/gutsy

Imported using git-ubuntu import.

Changelog parent: f5f3b89a73

New changelog entries:
  * Change the names of ia64 kernels to the right (non-SMP since they're
    merged) ones.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (0.36) gutsy; urgency=low
+
+  * Change the names of ia64 kernels to the right (non-SMP since they're
+    merged) ones.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Wed, 26 Sep 2007 13:50:19 -0600
+
 livecd-rootfs (0.35) gutsy; urgency=low
 
   * Use linux-cell rather than linux-ps3.

livecd.sh

@@ -214,7 +214,7 @@ Flags: seen
 	    LIVELIST="$tocdlive casper"
     esac
 
-    dpkg -l livecd-rootfs	# get our version # in the log.
+    dpkg -l livecd-rootfs || true	# get our version # in the log.
     if [ "$FS" != "ubuntu-lpia" ]; then
         debootstrap --components=$(echo $COMP | sed 's/ /,/g') $STE $ROOT $MIRROR
     else
@@ -282,7 +282,7 @@ link_in_boot = $link_in_boot
 	    esac;;
 
 	# and the bastard stepchildren
-	ia64)		LIST="$LIST linux-itanium-smp linux-mckinley-smp";;
+	ia64)		LIST="$LIST linux-itanium linux-mckinley";;
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	sparc*)		LIST="$LIST linux-sparc64";;
 	*)		echo "Unknown architecture: no kernel."; exit 1;;