Merge lp://staging/~mtmiller/ubuntu/wily/octave/fix-build-and-break into lp://staging/ubuntu/wily-proposed/octave
| Status: | Merged |
|---|---|
| Merge reported by: | Sebastien Bacher |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~mtmiller/ubuntu/wily/octave/fix-build-and-break |
| Merge into: | lp://staging/ubuntu/wily-proposed/octave |
| Diff against target: |
5977 lines (+5836/-39) 9 files modified
.pc/applied-patches (+1/-0) .pc/qt-requires-opengl.patch/configure.ac (+3228/-0) .pc/qt-requires-opengl.patch/m4/acinclude.m4 (+2448/-0) configure.ac (+6/-0) debian/changelog (+8/-0) debian/control (+23/-39) debian/patches/qt-requires-opengl.patch (+75/-0) debian/patches/series (+1/-0) m4/acinclude.m4 (+46/-0) |
| To merge this branch: | bzr merge lp://staging/~mtmiller/ubuntu/wily/octave/fix-build-and-break |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-08-02.
Description of the change
This branch includes two changes necessary for a functional Octave 4.0.0 in wily. The first change fixes a build failure on the armhf architecture using a patch I am proposing for inclusion upstream. The patch disables building the Qt components of Octave when Qt was configured for GLES, as it appears to be on Ubuntu armhf. The second change updates the list of Breaks to the versions currently found in wily (some of which are already good for Octave 4.0, some of which will need to be rebuilt).
I've done a test build of the qt-requires-
| Mike Miller (mtmiller) wrote | # |
Seems like the patch has been merged in https:/