Merge lp://staging/~sergiusens/ubuntu-seeds/ciborium into lp://staging/~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.trusty
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~sergiusens/ubuntu-seeds/ciborium |
Merge into: | lp://staging/~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.trusty |
Diff against target: |
717 lines (+417/-133) 11 files modified
STRUCTURE (+9/-3) desktop (+113/-0) live (+37/-0) sdk (+1/-0) sdk-libs (+19/-6) sdk-libs-dev (+2/-1) ship-live (+35/-0) touch (+25/-123) touch-android (+45/-0) touch-core (+130/-0) touch-tests (+1/-0) |
To merge this branch: | bzr merge lp://staging/~sergiusens/ubuntu-seeds/ciborium |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ricardo Salveti | Pending | ||
Review via email: mp+229716@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2014-08-06.
Unmerged revisions
- 235. By Sergio Schvezov
-
Adding ciborium
- 234. By Steve Langasek
-
Pull in only the Qt5 bits of autopilot-qt, allowing us to drop qt4 from the images
- 233. By Martin Pitt
-
Replace fonts-arphic-ukai with fonts-wqy-microhei for Chinese
- 232. By Colin Watson
-
Add a touch-tests seed containing all the *-autopilot packages from touch, useful for RTM branching.
- 231. By Oliver Grawert
-
move the qtmir-android package properly to touch-android, so desktop-next does not try to pull it in
- 230. By Ricardo Salveti
-
Adding qtmir-android to touch
- 229. By Ricardo Salveti
-
Adding account-polld (push client account notification)
- 228. By Steve Langasek
-
Revert previous change, which pulls in wrong packages on ubuntu-desktop-next and didn't even help on the phone.
- 227. By Steve Langasek
-
Force libmirclientpla
tform-android, libmirplatformg raphics- android into touch-core for the moment to unbreak phone builds (will break ubuntu-desktop-next in return until we get this properly sorted) - 226. By Ricardo Salveti
-
Adding udisks2 for sdcard support