Drop references to kubuntu-plasma5, obsolete since wily

This commit is contained in:
Steve Langasek 2023-09-06 11:24:06 -07:00
parent d7f2a4f240
commit abc60bc135
3 changed files with 7 additions and 13 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (23.10.33) UNRELEASED; urgency=medium
* Drop references to kubuntu-plasma5, obsolete since wily
-- Steve Langasek <steve.langasek@ubuntu.com> 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.

View File

@ -16,7 +16,6 @@ ALL_TRIPLETS="
edubuntu::
kubuntu::
kubuntu-dvd::
kubuntu-plasma5::
lubuntu::
ubuntu-unity::
mythbuntu::

View File

@ -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'