Merge lp:~dsmythies/installation-guide/trusty12 into lp:~ubuntu-core-dev/installation-guide/ubuntu
Status: | Merged |
---|---|
Merge reported by: | Iain Lane |
Merged at revision: | not available |
Proposed branch: | lp:~dsmythies/installation-guide/trusty12 |
Merge into: | lp:~ubuntu-core-dev/installation-guide/ubuntu |
Diff against target: |
70 lines (+44/-3) (has conflicts) 3 files modified
build/arch-options/armhf (+25/-0) build/build.sh (+1/-2) debian/changelog (+18/-1) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp:~dsmythies/installation-guide/trusty12 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Approve | ||
Review via email: mp+214307@code.launchpad.net |
Description of the change
The armhf did not build, and in this version of the code it never has.
On 2103.08.04 two branches of this code deviated.
This merge proposal adds a file from branches Rev 44 to core Rev 529 (or thereabouts).
I have made a ppa and it does seem to build properly.
References:
https:/
https:/
http://
http://
https:/
Thank you, this has been merged into trunk and will be available in the next release.