Merge lp://staging/~rohangarg/ubuntu-seeds/kubuntu.raring into lp://staging/~kubuntu-dev/ubuntu-seeds/kubuntu.raring

Proposed by Rohan Garg
Status: Merged
Merged at revision: 1195
Proposed branch: lp://staging/~rohangarg/ubuntu-seeds/kubuntu.raring
Merge into: lp://staging/~kubuntu-dev/ubuntu-seeds/kubuntu.raring
Diff against target: 332 lines (+306/-1)
4 files modified
STRUCTURE (+9/-1)
active (+242/-0)
active-live (+35/-0)
active-ship (+20/-0)
To merge this branch: bzr merge lp://staging/~rohangarg/ubuntu-seeds/kubuntu.raring
Reviewer Review Type Date Requested Status
Jonathan Riddell (community) Approve
Review via email: mp+139711@code.staging.launchpad.net

Description of the change

Merge active seeds into desktop so that the other active seed can be dropped and everything is generated from kubuntu-meta

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

On Thu, Dec 13, 2012 at 02:25:22PM -0000, Rohan Garg wrote:
> --- STRUCTURE 2012-10-18 17:27:39 +0000
> +++ STRUCTURE 2012-12-13 14:24:22 +0000
> @@ -10,5 +10,13 @@
> dvd: ship development supported-common dvd-langsupport
> full: dvd desktop
> supported-desktop-extra: dvd dvd-live
> +
> +# Active
> +active: standard
> +active-ship: ship
> +active-live: active
> +active-ship-live: ship-live
> +
> # make sure supported remains the last entry
> -supported: dvd-live ship-live full supported-desktop-extra
> +supported: dvd-live ship-live full supported-desktop-extra active-ship-live supported-common
> +

Nothing appears to inherit from the active-ship or active-live seeds.
This will cause problems. I suggest adding them to supported along with
active-ship-live.

> --- active 1970-01-01 00:00:00 +0000
> +++ active 2012-12-13 14:24:22 +0000
[...]
> +Task-Metapackage: kubuntu-active
[...]
> --- desktop 2012-11-27 14:00:14 +0000
> +++ desktop 2012-12-13 14:24:22 +0000
[...]
> +Task-Metapackage: kubuntu-desktop
[...]
> --- full 2011-09-01 11:10:10 +0000
> +++ full 2012-12-13 14:24:22 +0000
[...]
> +Task-Metapackage: kubuntu-full

You can delete all these Task-Metapackage lines; they're redundant since
the default construction of SEEDCOLLECTION-SEEDNAME already produces the
right results here.

1195. By Rohan Garg

* Add active-live and active-ship to supported
* Drop Task-Metapackage key's , not required

Revision history for this message
Rohan Garg (rohangarg) wrote :

Thanks Colin! I've updated the files as per your review.

Revision history for this message
Rohan Garg (rohangarg) wrote :

Bump?

Revision history for this message
Jonathan Riddell (jr) wrote :

What are the changes in the active seeds compared to the current kubuntu-active seed collection?

Revision history for this message
Rohan Garg (rohangarg) wrote :

I've copied over the seeds from the Kubuntu Active seed, so no changes to the seed as such ( except adjusting STRUCTURE )

Revision history for this message
Jonathan Riddell (jr) wrote :

groovy, ship it

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches