Merge lp:~cyphermox/livecd-rootfs/lts-xenial into lp:livecd-rootfs
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Sebastien Bacher | ||||
Proposed branch: | lp:~cyphermox/livecd-rootfs/lts-xenial | ||||
Merge into: | lp:livecd-rootfs | ||||
Diff against target: |
593 lines (+343/-16) (has conflicts) 5 files modified
debian/changelog (+111/-0) debian/control (+4/-0) get-ppa-fingerprint (+19/-0) live-build/auto/build (+5/-0) live-build/auto/config (+204/-16) Text conflict in debian/changelog Text conflict in debian/control Text conflict in get-ppa-fingerprint Text conflict in live-build/auto/build Text conflict in live-build/auto/config |
||||
To merge this branch: | bzr merge lp:~cyphermox/livecd-rootfs/lts-xenial | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Langasek | Disapprove | ||
Review via email: mp+291819@code.launchpad.net |
Description of the change
In prevision for the HWE stack from xenial to be all backported to Trusty; here are the changes for setting it as default.
Unmerged revisions
- 916. By Mathieu Trudel-Lapierre
-
live-build/
auto/config: Switch HWE from lts-wily to lts-xenial.
(LP: #1568918) - 915. By Adam Conrad
-
Only install thermald on amd64|i386 on lubuntu, fixing PPC build.
- 914. By Adam Conrad
-
live-build/
auto/config: Switch HWE from lts-vivid to lts-wily. - 913. By Adam Conrad
-
Switch from lts-vivid to lts-wily HWE kernels (LP: #1524366)
- 912. By Adam Conrad
-
* Add xserver-
xorg-core- lts-vivid to X HWE hints for the resolver.
* Add libwayland-egl1-mesa- lts-vivid to X HWE hints (LP: #1479524)
* Add kde-window-manager to kubuntu hints to fix a resolver issue.
* Add thermald to lubuntu hints to work around lack of recommends. - 911. By Adam Conrad
-
* live-build/
auto/config: Switch HWE from lts-utopic to lts-vivid.
* Remove obsolete libegl1-mesa-drivers- lts-* from HWE_X_PACKAGES. - 910. By Adam Conrad
-
Add audacious-plugins to LUBUNTU_HWE_HINTS to unsnag the PPC build.
- 909. By Adam Conrad
-
Release 2.208.5
- 908. By Adam Conrad
-
Remove xscreensaver-data and xscreensaver with XUBUNTU_HWE_HINTS.
- 907. By Adam Conrad
-
* Rename XUBUNTU_HWE_HINTS to XFCE_HWE_HINTS, so it's more reusable
and have MYTHBUNTU, XUBUNTU, and UBUNTUSTUDIO all make use of it.
* Explicitly seed the correct notify option for every last flavour.
This can't land until xorg-lts-xenial has landed in trusty.