From 37ae47542bb58998c0bc03e9677fb77d98ef7310 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Mon, 22 Mar 2010 21:40:59 -0600 Subject: [PATCH] Import patches-unapplied version 1.108 to ubuntu/lucid Imported using git-ubuntu import. Changelog parent: 8a2fa455ea6a9414476982b1a1bf9ff2a76143f4 New changelog entries: * Deliver edubuntu-dvd/i386 ltsp squashfs image, since that's what actually gets built these days. * Update maintainer field. --- debian/changelog | 8 ++++++++ debian/control | 2 +- livecd.sh | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f734ad30..f8c05570 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (1.108) lucid; urgency=low + + * Deliver edubuntu-dvd/i386 ltsp squashfs image, since that's what + actually gets built these days. + * Update maintainer field. + + -- LaMont Jones Mon, 22 Mar 2010 21:40:59 -0600 + livecd-rootfs (1.107) lucid; urgency=low * Deliver edubuntu/i386 ltsp sqaushfs image. LP: #531546 diff --git a/debian/control b/debian/control index 951e772c..89f43f25 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: livecd-rootfs Section: devel Priority: optional Build-Depends: debhelper (>= 7) -Maintainer: Adam Conrad +Maintainer: LaMont Jones Standards-Version: 3.6.1.0 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk diff --git a/livecd.sh b/livecd.sh index 1c994a56..cbbf155e 100755 --- a/livecd.sh +++ b/livecd.sh @@ -649,7 +649,7 @@ Pin-Priority: 550 # LTSP chroot building (only in 32bit and for Edubuntu (DVD)) case $FS in - edubuntu) + edubuntu-dvd) if [ "$TARGETARCH" = "i386" ]; then # Make sure we don't make everything fail here ltsp-build-client --base $(pwd) --mirror $MIRROR --arch $TARGETARCH --dist $STE --chroot ltsp-live --purge-chroot --skipimage || true