Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-04 10:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.43 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: ec14a47253003e1745e9c1759431a3ccb576c93f

New changelog entries:
  * BuildLiveCD: Stop building ubuntu-defaults-image images with universe.
    ubuntu-defaults-zh-cn is in main now, and it causes images to overflow
    due to the extra /var/lib/apt/lists indexes.
This commit is contained in:
Martin Pitt 2011-10-07 18:29:59 +02:00 committed by usd-importer
parent ec14a47253
commit 312f12ef26
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BuildLiveCD
View File

@ -149,8 +149,7 @@ for STE in $SUITES; do
fi fi
COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build" COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
elif [ "$UBUNTU_DEFAULTS_LOCALE" ]; then elif [ "$UBUNTU_DEFAULTS_LOCALE" ]; then
# universe enabled until ubuntu-defaults-zh-cn is moved to main COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE}"
COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE} --components main,restricted,universe"
else else
COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}" COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
fi fi

10
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.43) oneiric; urgency=low
* BuildLiveCD: Stop building ubuntu-defaults-image images with universe.
ubuntu-defaults-zh-cn is in main now, and it causes images to overflow
due to the extra /var/lib/apt/lists indexes.
-- Martin Pitt <martin.pitt@ubuntu.com> Fri, 07 Oct 2011 18:29:59 +0200
livecd-rootfs (2.42) oneiric; urgency=low livecd-rootfs (2.42) oneiric; urgency=low
* Explicitly select ubuquity frontend as well, to match the * Explicitly select ubuquity frontend as well, to match the
@ -21,7 +29,7 @@ livecd-rootfs (2.40) oneiric; urgency=low
livecd-rootfs (2.39) oneiric; urgency=low livecd-rootfs (2.39) oneiric; urgency=low
* Explicitely select the oem-config frontend to install on a * Explicitly select the oem-config frontend to install on a
per-project basis, to match the ubiquity in use (LP: #820514) per-project basis, to match the ubiquity in use (LP: #820514)
-- Adam Conrad <adconrad@ubuntu.com> Mon, 26 Sep 2011 19:14:56 -0600 -- Adam Conrad <adconrad@ubuntu.com> Mon, 26 Sep 2011 19:14:56 -0600