diff --git a/debian/changelog b/debian/changelog index db9762d6..1bc354ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.208.12) trusty; urgency=medium + + * Rename old ubuntu-core tarballs to ubuntu-base, for consistency with + the changes already made to yakkety and the ubuntu-cdimage project. + LP: #1579950. + + -- Steve Langasek Mon, 09 May 2016 17:03:01 -0700 + livecd-rootfs (2.208.11) trusty; urgency=medium * Only install thermald on amd64|i386 on lubuntu, fixing PPC build. diff --git a/live-build/auto/config b/live-build/auto/config index 37c380cd..acf4dd3e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -164,7 +164,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; - ubuntu-core|base|ubuntu-touch) + ubuntu-core|ubuntu-base|base|ubuntu-touch) ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk @@ -363,7 +363,7 @@ case $PROJECT in PREINSTALL_POOL_SEEDS='server-ship' ;; - ubuntu-core) + ubuntu-core|ubuntu-base) add_task install minimal OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; @@ -451,7 +451,7 @@ case $ARCH in esac case $PROJECT in - ubuntu-server|ubuntu-core|ubuntu-touch) + ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch) OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false