diff --git a/debian/changelog b/debian/changelog index 5173909d..f394d122 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ livecd-rootfs (23.10.33) UNRELEASED; urgency=medium a common pattern * generic is the default kernel flavor in live-build on Ubuntu; remove hard-coded cargo-culting of this setting. + * Drop references to kubuntu-dvd, obsoleted in 2012. -- Steve Langasek Wed, 06 Sep 2023 11:23:17 -0700 diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 2bdcdcdc..dfe77ff3 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -15,7 +15,6 @@ fi ALL_TRIPLETS=" edubuntu:: kubuntu:: - kubuntu-dvd:: lubuntu:: ubuntu-unity:: ubuntu:: diff --git a/live-build/auto/config b/live-build/auto/config index b1f25bb6..ec695797 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -653,7 +653,7 @@ case $PROJECT in ubuntu-server|ubuntu-mini-iso) COMPONENTS='main' ;; - edubuntu|kubuntu|kubuntu-dvd|ubuntu-budgie|ubuntu-gnome|ubuntucinnamon|ubuntukylin) + edubuntu|kubuntu|ubuntu-budgie|ubuntu-gnome|ubuntucinnamon|ubuntukylin) COMPONENTS='main restricted universe' ;; lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu) @@ -787,7 +787,7 @@ case $PROJECT in EOF ;; - kubuntu|kubuntu-dvd) + kubuntu) add_task install minimal standard add_task install kubuntu-desktop LIVE_TASK='kubuntu-live'