diff --git a/debian/changelog b/debian/changelog index caf3415b..0d89af0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ livecd-rootfs (2.526) UNRELEASED; urgency=medium - * Drop the workaround for setting the base seed of Lubuntu and Lubuntu Next - now that Lubuntu Next is Lubuntu. + * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. * Don't follow recommends on Lubuntu now that this is no longer the case in the seed. diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 433cd327..0c0062a6 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -21,7 +21,6 @@ ALL_TRIPLETS=" kubuntu-dvd:: kubuntu-plasma5:: lubuntu:: - lubuntu-next:: mythbuntu:: ubuntu:: ubuntu-base:: diff --git a/live-build/auto/config b/live-build/auto/config index 10f288ab..069a69dc 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -323,7 +323,7 @@ if ! [ -e config/germinate-output/structure ]; then fi case $PROJECT in - base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|lubuntu-next|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) + base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) INITRAMFS_COMPRESSION="lzma" ;; esac @@ -434,18 +434,6 @@ case $PROJECT in esac ;; - lubuntu-next) - add_task install minimal standard lubuntu-qt-desktop - LIVE_TASK='lubuntu-live-qt' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac - COMPONENTS='main restricted universe multiverse' - case $ARCH in - amd64|i386) KERNEL_FLAVOURS=generic ;; - esac - ;; - ubuntu-gnome) add_task install minimal standard ubuntu-gnome-desktop LIVE_TASK='ubuntu-gnome-live'