Merge lp:~unit193/ubuntu-release-upgrader/core-upgrades into lp:ubuntu-release-upgrader

Proposed by Unit 193 on 2015-02-18
Status: Merged
Merged at revision: 2870
Proposed branch: lp:~unit193/ubuntu-release-upgrader/core-upgrades
Merge into: lp:ubuntu-release-upgrader
Diff against target: 62 lines (+20/-3) (has conflicts)
2 files modified
data/DistUpgrade.cfg (+10/-3)
debian/changelog (+10/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~unit193/ubuntu-release-upgrader/core-upgrades
Reviewer Review Type Date Requested Status
Brian Murray 2015-02-18 Needs Information on 2015-02-19
Julien Lavergne (community) 2015-02-18 Approve on 2015-02-19
Simon Steinbeiß (community) 2015-02-18 Approve on 2015-02-19
Pasi Lallinaho (community) community 2015-02-18 Approve on 2015-02-18
Walter Lapchynski (community) Approve on 2015-02-18
Review via email: mp+250224@code.launchpad.net

Description of the Change

As it is now, if a user installs from the mini.iso and installs the xubuntu-core or lubuntu-core tasks, upon upgrade to the next release they end up getting the full *-desktop meta, this is not desired.

To post a comment you must log in.
Walter Lapchynski (wxl) wrote :

fwiw, this looks good to me. not the official lubuntu dev, but, i count for something. :)

review: Approve
Pasi Lallinaho (knome) wrote :

To confirm that this change is ACK'd community-wise by the Xubuntu Project Lead today on IRC.

review: Approve (community)
Simon Steinbeiß (ochosi) wrote :

I'll admit straight away that I don't know enough about the release-upgrader to be able to technically review this MR, I hope ubuntu-core-devs (or someone else more experienced with this) will take care of that part.
However, the change Unit193 describes above is what we want. Approving this as Xubuntu Project Lead.

review: Approve
Julien Lavergne (gilir) wrote :

Looks OK to me for the Lubuntu part. Thanks Unit193 :-)
(you just have to remove the >>>>>>> MERGE-SOURCE / <<<<<<< TREE if you want this to be merged :-))

review: Approve
Brian Murray (brian-murray) wrote :

Given that neither lubuntu-meta or xubuntu-meta includes ubuntu-release-upgrader-core (which would perform the upgrade and use DistUpgrade.cfg), this seems a bit strange to me.

Could you provide some more information as to what problem you are trying to solve? One way to test your changes would be to run do-release-upgrade then cancel the upgrade after the dist upgrader tarball is downloaded, switch to whatever directory it is in /tmp/ e.g. /tmp/dist-upgrader-XYZ and modify data/DistUpgrade.cfg then run the vivid symlink there as root.

Finally, having lubuntu-core as a key dependency of itself seems rather redundant.

review: Needs Information
Unit 193 (unit193) wrote :

Sure, they don't seed that exact package, but both install and use it by installing update-manager as you can see http://cdimage.ubuntu.com/lubuntu/daily-live/current/vivid-desktop-i386.manifest and http://cdimage.ubuntu.com/xubuntu/daily-live/current/vivid-desktop-i386.manifest.

Both seeds/metas have a package and task called $flavor-core, so a user can optionally install only the minimal DE and default config. Currently when you upgrade, as expected $flavor-desktop is pulled in but as the user only wanted the bare minimum of defaults, this is highly undesired.

Yes, you are right there, I added Lubuntu support later after working out with the Xubuntu team how best to do it. Perhaps lubuntu-artwork or lubuntu-default-session would be a better target for that core.

Also, sorry for messing up the merge, seems there's some conflicts.

Brian Murray (brian-murray) wrote :

I've installed the xubuntu-core system from a Xubuntu 14.10 mini iso and agree those changes make sense. Could you sort out what makes sense for lubuntu-core? Otherwise, I'll just merge the Xubuntu only changes.

Unit 193 (unit193) wrote :

Not hearing back from them, I'd just go with lubuntu-artwork for lubuntu-core's keydeps or just drop it. Want me to try and fix it all up?

Julien Lavergne (gilir) wrote :

Sorry for the delay. The keydeps for lubuntu-core could be :
KeyDependencies=lubuntu-artwork, lubuntu-default-settings, openbox
Thanks :-)

Brian Murray (brian-murray) wrote :

Okay, that sounds good to me now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/DistUpgrade.cfg'
2--- data/DistUpgrade.cfg 2014-11-10 13:12:53 +0000
3+++ data/DistUpgrade.cfg 2015-02-18 22:06:22 +0000
4@@ -10,9 +10,9 @@
5 # Distro contains global information about the upgrade
6 [Distro]
7 # the meta-pkgs we support
8-MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop,
9- ubuntustudio-desktop, mythbuntu-desktop, kubuntu-netbook,
10- lubuntu-desktop, ubuntu-gnome-desktop
11+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
12+ xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
13+ kubuntu-netbook, lubuntu-core, lubuntu-desktop, ubuntu-gnome-desktop
14 BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
15 Demotions=demoted.cfg
16 #RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
17@@ -60,6 +60,10 @@
18 [ubuntu-netbook]
19 KeyDependencies=gdm, ubuntu-netbook-default-settings
20
21+[xubuntu-core]
22+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
23+PostUpgradeRemove=notification-daemon
24+
25 [xubuntu-desktop]
26 KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
27 PostUpgradeRemove=notification-daemon
28@@ -73,6 +77,9 @@
29 [mythbuntu-desktop]
30 KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
31
32+[lubuntu-core]
33+KeyDependencies=lubuntu-core, lubuntu-default-settings
34+
35 [lubuntu-desktop]
36 KeyDependencies=lubuntu-core, lubuntu-default-settings
37
38
39=== modified file 'debian/changelog'
40--- debian/changelog 2015-02-18 21:59:56 +0000
41+++ debian/changelog 2015-02-18 22:06:22 +0000
42@@ -1,3 +1,4 @@
43+<<<<<<< TREE
44 ubuntu-release-upgrader (1:15.04.7) UNRELEASED; urgency=medium
45
46 * Log more information when key packages are not available/downloadable.
47@@ -6,6 +7,15 @@
48
49 -- Brian Murray <brian@ubuntu.com> Wed, 18 Feb 2015 12:49:07 -0800
50
51+=======
52+ubuntu-release-upgrader (1:15.04.7) UNRELEASED; urgency=medium
53+
54+ * Fix the upgrade case where the user only has
55+ xubuntu-core or lubuntu-core installed.
56+
57+ -- Unit 193 <unit193@ubuntu.com> Wed, 18 Feb 2015 16:56:59 -0500
58+
59+>>>>>>> MERGE-SOURCE
60 ubuntu-release-upgrader (1:15.04.6) vivid; urgency=medium
61
62 * Port KDE GUIs to native Qt5 versions.

Subscribers

People subscribed via source and target branches