Merge lp:~cjwatson/webbrowser-app/allow-gles into lp:webbrowser-app

[Colin Watson]

Fix versioned dependencies on qtdeclarative5-ubuntu-ui-toolkit-plugin to allow qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.

https://code.launchpad.net/~osomon/webbrowser-app/uitk-1.3/+merge/267544 regressed installability of the ubuntu-touch metapackage on amd64 and i386: a >= versioned dependency may not be satisfied by a virtual package, but on amd64/i386 we rely on being able to use -gles variants of packages. We thus need to explicitly allow qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.

Incidentally, this change from that MP looks somewhat dubious and possibly a mistake:

- qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3),

... but I've simply fixed that up to allow -gles rather than reverting it, in case it was in fact intentional.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1140
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2104/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/858
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/858/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/858
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3742
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22604

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2104/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Thanks for that Colin.

The other change that looked dubious was in fact intentional, I should have explained it in the merge request description. qtdeclarative5-ubuntu-ui-extras-browser-plugin has been deprecated for over a year (and replaced by qtdeclarative5-ubuntu-web-plugin), this dependency was a useless leftover. And the fact that webapp-container didn’t depend on qtdeclarative5-ubuntu-ui-toolkit-plugin was obviously a mistake, although a harmless one since it pulled the dependency indirectly anyway.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-08-11 19:05:10 +0000
+++ debian/control	2015-08-16 23:16:32 +0000
@@ -21,7 +21,7 @@
                qtbase5-private-dev,
                qtdeclarative5-dev,
                qtdeclarative5-private-dev,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3),
+               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
                xvfb,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/webbrowser-app
@@ -42,7 +42,7 @@
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-dialogs,
          qml-module-qtquick-window2 (>= 5.3),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
          qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
          qtdeclarative5-unity-action-plugin,
 Replaces: webbrowser-app-assets,
@@ -65,7 +65,7 @@
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
          qtdeclarative5-accounts-plugin,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
          qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
          qtdeclarative5-unity-action-plugin,
          unity-webapps-qml,
@@ -83,7 +83,7 @@
          ${shlibs:Depends},
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
          qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
 Replaces: webbrowser-app (<< 0.21)
 Breaks: webbrowser-app (<< 0.21)
@@ -100,7 +100,7 @@
          liboxideqt-qmlplugin (>= 1.6),
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
          qtdeclarative5-ubuntu-web-plugin-assets (>= ${source:Version}),
 Description: Ubuntu web QML plugin
  A standalone QML plugin that contains the WebView component,