From 812f9e78182c8943c6d0af276978dac4e8bb6729 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 9 May 2009 00:34:38 +0100 Subject: [PATCH] Import patches-unapplied version 0.81 to ubuntu/karmic Imported using git-ubuntu import. Changelog parent: 6da764e607b666564633bde870cccbd9fdfe14dd New changelog entries: * ia64 uses -ia64 kernels across the board now. * BuildLiveCD: default to karmic. --- BuildLiveCD | 2 +- debian/changelog | 7 +++++++ livecd.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index 70a00a72..d4e7b5b2 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -27,7 +27,7 @@ fi ARCH=$(dpkg --print-installation-architecture) SUBARCH="" SUBARCHARG="" -DEFAULTSUITE="jaunty" +DEFAULTSUITE="karmic" NEWSUITE="" SUITES="" PROPOSED="" diff --git a/debian/changelog b/debian/changelog index c12d1ece..23c95bd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (0.81) karmic; urgency=low + + * ia64 uses -ia64 kernels across the board now. + * BuildLiveCD: default to karmic. + + -- Colin Watson Sat, 09 May 2009 00:34:38 +0100 + livecd-rootfs (0.80) jaunty; urgency=low * Add standard^ to UNR. diff --git a/livecd.sh b/livecd.sh index 32289b82..db1fbf06 100755 --- a/livecd.sh +++ b/livecd.sh @@ -319,7 +319,7 @@ link_in_boot = $link_in_boot # and the bastard stepchildren lpia) LIST="$LIST linux-lpia";; - ia64) LIST="$LIST linux-itanium linux-mckinley";; + ia64) LIST="$LIST linux-ia64";; hppa) LIST="$LIST linux-hppa32 linux-hppa64";; powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";; sparc*) LIST="$LIST linux-sparc64";;