From 1f1b49c242c186e792af2db55ca7505f8b6b24f1 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 26 Sep 2008 16:09:54 +1000 Subject: [PATCH] Import patches-unapplied version 0.70 to ubuntu/intrepid Imported using git-ubuntu import. Changelog parent: 72ff4b32a7a3b7f6d8c585a1672bf26ed57e5236 New changelog entries: * linux-lpia-meta exists, change lpia's kernel back to linux-lpia. --- debian/changelog | 6 ++++++ livecd.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4f1c8d0a..cbf7d03c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.70) intrepid; urgency=low + + * linux-lpia-meta exists, change lpia's kernel back to linux-lpia. + + -- Steve Kowalik Fri, 26 Sep 2008 16:09:54 +1000 + livecd-rootfs (0.69) intrepid; urgency=low * add ubuntu-mobile to build targets diff --git a/livecd.sh b/livecd.sh index 5863a172..fec85f5a 100755 --- a/livecd.sh +++ b/livecd.sh @@ -307,7 +307,7 @@ link_in_boot = $link_in_boot i386) LIST="$LIST linux-generic";; # and the bastard stepchildren - lpia) LIST="$LIST linux-image-2.6.27-3-lpia";; + lpia) LIST="$LIST linux-lpia";; ia64) LIST="$LIST linux-itanium linux-mckinley";; hppa) LIST="$LIST linux-hppa32 linux-hppa64";; powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";;