From 77036593d719a0921f25a29d10a992dce9024d80 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 15 Feb 2024 14:20:46 -0800 Subject: [PATCH] Drop references to ubuntu-gnome which is not a current flavor. --- debian/changelog | 6 ++++++ debian/tests/default-bootstraps | 1 - live-build/auto/config | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6ca4df1..91d0f876 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.35) UNRELEASED; urgency=medium + + * Drop references to ubuntu-gnome which is not a current flavor. + + -- Steve Langasek Thu, 15 Feb 2024 14:20:36 -0800 + livecd-rootfs (24.04.34) noble; urgency=medium [ Michael Hudson-Doyle ] diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 5ce3fffe..b27fd8e0 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -28,7 +28,6 @@ ALL_TRIPLETS=" ubuntu-cpc::ubuntu-cpc ubuntu-cpc:minimized:ubuntu-cpc ubuntu-dvd:: - ubuntu-gnome:: ubuntukylin:: ubuntu-mate:: ubuntu-mate-core:: diff --git a/live-build/auto/config b/live-build/auto/config index 9d72463b..1f8e950e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -637,7 +637,7 @@ case $PROJECT in ubuntu-server|ubuntu-mini-iso) COMPONENTS='main' ;; - edubuntu|kubuntu|ubuntu-budgie|ubuntu-gnome|ubuntucinnamon|ubuntukylin) + edubuntu|kubuntu|ubuntu-budgie|ubuntucinnamon|ubuntukylin) COMPONENTS='main restricted universe' ;; lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu) @@ -874,7 +874,7 @@ case $PROJECT in https://git.launchpad.net/subiquity po config/catalog-translations ;; - lubuntu|ubuntu-gnome|ubuntu-unity|ubuntukylin) + lubuntu|ubuntu-unity|ubuntukylin) add_task install minimal standard ${PROJECT}-desktop LIVE_TASK=${PROJECT}-live ;;