From abc60bc13532d8ca7c23257eda1bf44c2774c528 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 6 Sep 2023 11:24:06 -0700 Subject: [PATCH] Drop references to kubuntu-plasma5, obsolete since wily --- debian/changelog | 6 ++++++ debian/tests/default-bootstraps | 1 - live-build/auto/config | 13 +------------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13336c23..22c50d7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.33) UNRELEASED; urgency=medium + + * Drop references to kubuntu-plasma5, obsolete since wily + + -- Steve Langasek Wed, 06 Sep 2023 11:23:17 -0700 + livecd-rootfs (23.10.32) mantic; urgency=medium * Make the hybrid canary images the default for Ubuntu. diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 4c0d396f..5e8a0fd0 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -16,7 +16,6 @@ ALL_TRIPLETS=" edubuntu:: kubuntu:: kubuntu-dvd:: - kubuntu-plasma5:: lubuntu:: ubuntu-unity:: mythbuntu:: diff --git a/live-build/auto/config b/live-build/auto/config index 374387b3..04d6a668 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -657,7 +657,7 @@ case $PROJECT in ubuntu-server|ubuntu-mini-iso) COMPONENTS='main' ;; - kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin|ubuntucinnamon) + kubuntu|kubuntu-dvd|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin|ubuntucinnamon) COMPONENTS='main restricted universe' ;; xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) @@ -798,17 +798,6 @@ case $PROJECT in add_chroot_hook remove-gnome-icon-cache ;; - kubuntu-plasma5) - add_task install minimal standard - add_package install kubuntu-plasma5-desktop - # Technically cheating, but PPAs don't have tasks and the - # live seed doesn't have a corresponding metapackage. We'll - # get away with this as long as kubuntu-desktop and - # kubuntu-plasma5-desktop don't grow too far apart. - LIVE_TASK='kubuntu-live' - add_chroot_hook remove-gnome-icon-cache - ;; - edubuntu) add_task install minimal standard edubuntu-desktop-gnome LIVE_TASK='edubuntu-live'