Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-07-23 23:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop edubuntu and kubuntu-active, both obsolete in *all* supported releases.

Browse Source
This commit is contained in:
Steve Langasek 2022-09-21 16:12:36 -07:00
parent e41c6f50df
commit b3343c1255
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ livecd-rootfs (2.781) UNRELEASED; urgency=medium
should be; and raspi images should not categorically include universe, should be; and raspi images should not categorically include universe,
they should follow the per-flavor rules. they should follow the per-flavor rules.
* Drop use of deprecated apt-key. * Drop use of deprecated apt-key.
* Drop edubuntu and kubuntu-active, both obsolete in *all* supported
releases.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 21 Sep 2022 13:26:30 -0700 -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 21 Sep 2022 13:26:30 -0700

3
debian/tests/default-bootstraps vendored
View File

@ -13,10 +13,7 @@ fi
# Listed subprojects can be combined with other projects as well, # Listed subprojects can be combined with other projects as well,
# but this list gives reasonable coverage. # but this list gives reasonable coverage.
ALL_TRIPLETS=" ALL_TRIPLETS="
edubuntu::
edubuntu-dvd::
kubuntu:: kubuntu::
kubuntu-active::
kubuntu-dvd:: kubuntu-dvd::
kubuntu-plasma5:: kubuntu-plasma5::
lubuntu:: lubuntu::

16
live-build/auto/config
View File

@ -620,9 +620,6 @@ fi
mkdir -p config/germinate-output mkdir -p config/germinate-output
case $PROJECT in case $PROJECT in
kubuntu-active*)
SEED=kubuntu-active.$SUITE
;;
kubuntu*) kubuntu*)
SEED=kubuntu.$SUITE SEED=kubuntu.$SUITE
;; ;;
@ -656,7 +653,7 @@ case $PROJECT in
ubuntu-server) ubuntu-server)
COMPONENTS='main' 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' COMPONENTS='main restricted universe'
;; ;;
xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) 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 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) kubuntu-plasma5)
add_task install minimal standard add_task install minimal standard
add_package install kubuntu-plasma5-desktop add_package install kubuntu-plasma5-desktop
@ -782,11 +773,6 @@ case $PROJECT in
add_chroot_hook remove-gnome-icon-cache 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) xubuntu)
add_task install minimal standard xubuntu-desktop add_task install minimal standard xubuntu-desktop
add_package install xterm add_package install xterm