Merge lp:~xubuntu-dev/livecd-rootfs/xubuntu-base into lp:livecd-rootfs

Proposed by Sean Davis on 2018-06-02
Status: Rejected
Rejected by: Sebastien Bacher on 2019-03-18
Proposed branch: lp:~xubuntu-dev/livecd-rootfs/xubuntu-base
Merge into: lp:livecd-rootfs
Diff against target: 37 lines (+19/-0)
2 files modified
debian/changelog (+6/-0)
live-build/auto/config (+13/-0)
To merge this branch: bzr merge lp:~xubuntu-dev/livecd-rootfs/xubuntu-base
Reviewer Review Type Date Requested Status
Adam Conrad 2018-07-02 Pending
Ubuntu Core Development Team 2018-06-02 Pending
Review via email: mp+347319@code.launchpad.net

Commit message

Add xubuntu-base to livecd-rootfs

Description of the change

This series of patches adds Xubuntu Base to the official Ubuntu CD Image download links. Xubuntu Base is supported by the Xubuntu Team and is the ISO image for the xubuntu-core task which has been around for a few releases now.

There has been some conflict with the previous naming of Xubuntu Base/Core because of it's similarity to Ubuntu Core. Regardless, you can learn more about it here: https://xubuntu.org/news/introducing-xubuntu-core/

Related branches:
- https://code.launchpad.net/~xubuntu-dev/debian-cd/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/xubuntu-base

To post a comment you must log in.
Balint Reczey (rbalint) wrote :

The target Bazaar branch is not active anymore.
Please resubmit the merge proposal against https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/master .

Sebastien Bacher (seb128) wrote :

Closing by previous comment

Unmerged revisions

1270. By Sean Davis on 2018-05-31

Merge lp:livecd-rootfs rev 1674

1269. By Sean Davis on 2018-03-28

Merge lp:livecd-rootfs rev 1650

1268. By Sean Davis on 2016-01-30

Use the xubuntu-core task

1267. By Sean Davis on 2016-01-26

Replace Xubuntu Core with Base

1266. By Sean Davis on 2016-01-26

Merge in lp:~unit193/livecd-rootfs/xubuntu-core

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2018-05-28 14:39:53 +0000
+++ debian/changelog 2018-06-02 01:09:33 +0000
@@ -1,3 +1,9 @@
1livecd-rootfs (2.529) UNRELEASED; urgency=medium
2
3 * Add xubuntu-base
4
5 -- Sean Davis <smd.seandavis@gmail.com> Thu, 31 May 2018 06:30:27 -0400
6
1livecd-rootfs (2.528) cosmic; urgency=medium7livecd-rootfs (2.528) cosmic; urgency=medium
28
3 * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that9 * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that
410
=== modified file 'live-build/auto/config'
--- live-build/auto/config 2018-05-09 02:12:15 +0000
+++ live-build/auto/config 2018-06-02 01:09:33 +0000
@@ -408,6 +408,19 @@
408 esac408 esac
409 ;;409 ;;
410410
411 xubuntu-base)
412 add_task install minimal standard xubuntu-core
413 add_package install xterm
414 LIVE_TASK='xubuntu-live'
415 case $ARCH in
416 amd64) add_package live linux-signed-generic ;;
417 esac
418 COMPONENTS='main restricted universe multiverse'
419 case $ARCH in
420 amd64|i386) KERNEL_FLAVOURS=generic ;;
421 esac
422 ;;
423
411 ubuntu-netbook)424 ubuntu-netbook)
412 add_task install minimal standard ubuntu-netbook425 add_task install minimal standard ubuntu-netbook
413 LIVE_TASK='netbook-live'426 LIVE_TASK='netbook-live'

Subscribers

People subscribed via source and target branches