Merge lp:~mvo/webbrowser-app/multiarch-fixes into lp:webbrowser-app

[Michael Vogt]

debian/control: update libqt5webkit5-qmlwebkitplugin -> qml-module-qtwebkit (fixes a multiarch install failure)

Trivial fix to update the dependencies from the transitional libqt5webkit5-qmlwebkitplugin to the real qml-module-qtwebkit - this fixes a multiarch install failure.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:632
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1911
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3529
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3529/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2141
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2141/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

The change looks good, thanks for taking care of this Michael.

I wonder if the new entry in debian/changelog is really necessary? And if the CI train will deal gracefully with it?

Usually when I modify files under debian/, I don’t add a new changelog entry, but I make sure they are documented in the commit message, which is what the CI train picks up to build its own changelog entry. But you probably know better than me how it all works.

review: Approve

[lp:~mvo/webbrowser-app/multiarch-fixes]

632. By Michael Vogt on 2014-07-23

debian/control:
- update libqt5webkit5-qmlwebkitplugin -> qml-module-qtwebkit

[Michael Vogt (mvo)]

Thanks Olivier for your quick review!

I agree that the changelog entry is unneeded, I still need to get used to the new citrain world order (I tend to forget when in a rush) :) I removed the unneeded entry now.

=== modified file 'debian/control'
--- debian/control	2014-07-09 16:36:52 +0000
+++ debian/control	2014-07-23 07:59:55 +0000
@@ -8,7 +8,7 @@
                hardening-wrapper,
                python3-all,
                libqt5sql5-sqlite,
-               libqt5webkit5-qmlwebkitplugin,
+               qml-module-qtwebkit,
                liboxideqt-qmlplugin (>= 1.0.2),
                qt5-default,
                qt5-qmake,
@@ -58,7 +58,7 @@
          fonts-liberation,
          liboxideqt-qmlplugin (>= 1.1),
          libqt5sql5-sqlite,
-         libqt5webkit5-qmlwebkitplugin,
+         qml-module-qtwebkit,
          qtdeclarative5-accounts-plugin,
          qtdeclarative5-qtquick2-plugin (>= 5.2),
          qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
@@ -77,7 +77,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libqt5webkit5-qmlwebkitplugin,
+         qml-module-qtwebkit,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),