[Merge] lp:~mtmiller/ubuntu/wily/octave/fix-build-and-break into lp:ubuntu/wily-proposed/octave

[Mike Miller]

Mike Miller has proposed merging lp:~mtmiller/ubuntu/wily/octave/fix-build-and-break into lp:ubuntu/wily-proposed/octave.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~mtmiller/ubuntu/wily/octave/fix-build-and-break/+merge/266672

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-opengl.patch in my PPA (https://launchpad.net/~mtmiller/+archive/ubuntu/octave/+packages). The armhf build hasn't completed yet but it at least got past the point where the error appeared in 4.0.0-3.
-- 
Your team Ubuntu branches is requested to review the proposed merge of lp:~mtmiller/ubuntu/wily/octave/fix-build-and-break into lp:ubuntu/wily-proposed/octave.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 200547 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150802/e3ae9640/attachment-0001.diff>