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

[Unit 193]

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.

[ԜаӀtеr Ⅼарсһуnѕkі (wxl)]

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

review: Approve

[Pasi Lallinaho (knome)]

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

review: Approve (community)

[Simon Steinbeiß (ochosi)]

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)]

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)]

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)]

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)]

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)]

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)]

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

[Brian Murray (brian-murray)]

Okay, that sounds good to me now.

=== modified file 'data/DistUpgrade.cfg'
--- data/DistUpgrade.cfg	2014-11-10 13:12:53 +0000
+++ data/DistUpgrade.cfg	2015-02-18 22:06:22 +0000
@@ -10,9 +10,9 @@
 # Distro contains global information about the upgrade
 [Distro]
 # the meta-pkgs we support
-MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, 
-   ubuntustudio-desktop, mythbuntu-desktop, kubuntu-netbook, 
-   lubuntu-desktop, ubuntu-gnome-desktop
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core, 
+   xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop, 
+   kubuntu-netbook, lubuntu-core, lubuntu-desktop, ubuntu-gnome-desktop
 BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
 Demotions=demoted.cfg
 #RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
@@ -60,6 +60,10 @@
 [ubuntu-netbook]
 KeyDependencies=gdm, ubuntu-netbook-default-settings
 
+[xubuntu-core]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
 [xubuntu-desktop]
 KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
 PostUpgradeRemove=notification-daemon
@@ -73,6 +77,9 @@
 [mythbuntu-desktop]
 KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
 
+[lubuntu-core]
+KeyDependencies=lubuntu-core, lubuntu-default-settings
+
 [lubuntu-desktop]
 KeyDependencies=lubuntu-core, lubuntu-default-settings
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-18 21:59:56 +0000
+++ debian/changelog	2015-02-18 22:06:22 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-release-upgrader (1:15.04.7) UNRELEASED; urgency=medium
 
   * Log more information when key packages are not available/downloadable.
@@ -6,6 +7,15 @@
 
  -- Brian Murray <[e-mail]>  Wed, 18 Feb 2015 12:49:07 -0800
 
+=======
+ubuntu-release-upgrader (1:15.04.7) UNRELEASED; urgency=medium
+
+  * Fix the upgrade case where the user only has
+    xubuntu-core or lubuntu-core installed.
+
+ -- Unit 193 <[e-mail]>  Wed, 18 Feb 2015 16:56:59 -0500
+
+>>>>>>> MERGE-SOURCE
 ubuntu-release-upgrader (1:15.04.6) vivid; urgency=medium
 
   * Port KDE GUIs to native Qt5 versions.