From 4b16ae8f92b1e71ce78dd89c19190cd7128c2ccd Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Thu, 23 Jul 2009 03:08:53 -0500 Subject: [PATCH] Import patches-unapplied version 0.88 to ubuntu/karmic Imported using git-ubuntu import. Changelog parent: 350c154c6eac5f0d30bedcb47986290747cba054 New changelog entries: [ Adam Conrad ] * Make the sort file fetch a no-op for now, since the old URL was hanging the builds, and we don't actually HAVE sort files. If that ever changes, we can undo this. [ Mario Limonciello ] * Install a hybrid of tasks and a meta package for mythbuntu to boot out all the gnome stuff that's getting added by dependency resolution order. --- debian/changelog | 14 ++++++++++++++ livecd.sh | 7 ++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c55b3aad..bdb77449 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +livecd-rootfs (0.88) karmic; urgency=low + + [ Adam Conrad ] + * Make the sort file fetch a no-op for now, since the old URL was + hanging the builds, and we don't actually HAVE sort files. If + that ever changes, we can undo this. + + [ Mario Limonciello ] + * Install a hybrid of tasks and a meta package for mythbuntu to + boot out all the gnome stuff that's getting added by dependency + resolution order. + + -- Mario Limonciello Thu, 23 Jul 2009 03:08:53 -0500 + livecd-rootfs (0.87) karmic; urgency=low [ Timo Aaltonen ] diff --git a/livecd.sh b/livecd.sh index d5dcbe18..47285469 100755 --- a/livecd.sh +++ b/livecd.sh @@ -213,8 +213,8 @@ Flags: seen COMP="main restricted universe" ;; mythbuntu) - LIST="$LIST minimal^ standard^ mythbuntu-desktop" - LIVELIST="mythbuntu-live laptop-detect casper lupin-casper" + LIST="$LIST minimal^ standard^ mythbuntu-desktop^ mythbuntu-desktop" + LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper" COMP="main restricted universe multiverse" ;; base) @@ -553,7 +553,8 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse livefs_squash() { squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${TARGETARCH}" - if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then + #if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then + if false; then echo "Using the squashfs sort list from ${squashsort}." else echo "Unable to fetch squashfs sort list; using a blank list."