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.
This commit is contained in:
LaMont Jones 2010-03-22 21:40:59 -06:00 committed by usd-importer
parent 8a2fa455ea
commit 37ae47542b
3 changed files with 10 additions and 2 deletions

8
debian/changelog vendored
View File

@ -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 <lamont@ubuntu.com> Mon, 22 Mar 2010 21:40:59 -0600
livecd-rootfs (1.107) lucid; urgency=low
* Deliver edubuntu/i386 ltsp sqaushfs image. LP: #531546

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: livecd-rootfs
Section: devel
Priority: optional
Build-Depends: debhelper (>= 7)
Maintainer: Adam Conrad <adconrad@ubuntu.com>
Maintainer: LaMont Jones <lamont@ubuntu.com>
Standards-Version: 3.6.1.0
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk

View File

@ -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