From b3343c12554d4105b9ae75ca96582de85ac804f6 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 21 Sep 2022 16:12:36 -0700 Subject: [PATCH] Drop edubuntu and kubuntu-active, both obsolete in *all* supported releases. --- debian/changelog | 2 ++ debian/tests/default-bootstraps | 3 --- live-build/auto/config | 16 +--------------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0e507c5..ac93204d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ livecd-rootfs (2.781) UNRELEASED; urgency=medium should be; and raspi images should not categorically include universe, they should follow the per-flavor rules. * Drop use of deprecated apt-key. + * Drop edubuntu and kubuntu-active, both obsolete in *all* supported + releases. -- Steve Langasek Wed, 21 Sep 2022 13:26:30 -0700 diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 3a65b99c..ea2f86f1 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -13,10 +13,7 @@ fi # Listed subprojects can be combined with other projects as well, # but this list gives reasonable coverage. ALL_TRIPLETS=" - edubuntu:: - edubuntu-dvd:: kubuntu:: - kubuntu-active:: kubuntu-dvd:: kubuntu-plasma5:: lubuntu:: diff --git a/live-build/auto/config b/live-build/auto/config index da0e1199..13052ed2 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -620,9 +620,6 @@ fi mkdir -p config/germinate-output case $PROJECT in - kubuntu-active*) - SEED=kubuntu-active.$SUITE - ;; kubuntu*) SEED=kubuntu.$SUITE ;; @@ -656,7 +653,7 @@ case $PROJECT in ubuntu-server) COMPONENTS='main' ;; - kubuntu|kubuntu-dvd|kubuntu-active|kubuntu-plasma5|edubuntu|edubuntu-dvd|ubuntu-gnome|ubuntu-budgie|ubuntukylin) + kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin) COMPONENTS='main restricted universe' ;; xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) @@ -765,12 +762,6 @@ case $PROJECT in add_chroot_hook remove-gnome-icon-cache ;; - kubuntu-active) - add_task install minimal standard kubuntu-active - LIVE_TASK='kubuntu-active-live' - add_chroot_hook remove-gnome-icon-cache - ;; - kubuntu-plasma5) add_task install minimal standard add_package install kubuntu-plasma5-desktop @@ -782,11 +773,6 @@ case $PROJECT in add_chroot_hook remove-gnome-icon-cache ;; - edubuntu|edubuntu-dvd) - add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome - LIVE_TASK='edubuntu-live' - ;; - xubuntu) add_task install minimal standard xubuntu-desktop add_package install xterm