Merge lp:~robert-ancell/address-book-app/new-qml-packages into lp:address-book-app

[Robert Ancell]

Use new QML package name for qml-module-qtcontacts, qml-module-ubuntu-keyboard, qml-module-qtquick2, qml-module-ubuntu-onlineaccounts-client.

[Robert Ancell (robert-ancell)]

Note the Ubuntu.Keyboard package name is not yet landed [1]. This is why you will need to support both the old and new names. The other packages have the new names in both vivid and wily.

[1] https://code.launchpad.net/~robert-ancell/ubuntu-keyboard/new-qml-packages/+merge/266508

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:462
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/864/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/167/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3532/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3529/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/864/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

462. By Robert Ancell on 2015-07-31

Use new QML package name for qml-module-qtcontacts, qml-module-ubuntu-keyboard, qml-module-qtquick2, qml-module-ubuntu-onlineaccounts-client

=== modified file 'debian/control'
--- debian/control	2015-05-14 21:23:43 +0000
+++ debian/control	2015-07-31 03:08:25 +0000
@@ -14,10 +14,10 @@
                qtdeclarative5-dev-tools [i386 amd64 armhf],
                qtdeclarative5-gsettings1.0 [i386 amd64 armhf],
                qtdeclarative5-ofono0.2 [i386 amd64 armhf],
-               qtdeclarative5-qtcontacts-plugin [i386 amd64 armhf],
+               qml-module-qtcontacts [i386 amd64 armhf],
                qtdeclarative5-ubuntu-content1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-history0.1 [i386 amd64 armhf],
-               qtdeclarative5-ubuntu-keyboard-extensions0.1 [i386 amd64 armhf],
+               qml-module-ubuntu-keyboard [i386 amd64 armhf] | qtdeclarative5-ubuntu-keyboard-extensions0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-syncmonitor0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-telephony-phonenumber0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-ui-toolkit-plugin [i386 amd64 armhf],
@@ -45,12 +45,12 @@
          qmlscene,
          qtcontact5-galera,
          qtdeclarative5-gsettings1.0,
-         qtdeclarative5-qtcontacts-plugin,
-         qtdeclarative5-qtquick2-plugin,
+         qml-module-qtcontacts,
+         qml-module-qtquick2,
          qtdeclarative5-ofono0.2,
          qtdeclarative5-ubuntu-addressbook0.1 (= ${binary:Version}),
          qtdeclarative5-ubuntu-history0.1,
-         qtdeclarative5-ubuntu-keyboard-extensions0.1,
+         qml-module-ubuntu-keyboard | qtdeclarative5-ubuntu-keyboard-extensions0.1,
          qtdeclarative5-ubuntu-telephony-phonenumber0.1 (>= 0.1+14.10.20140715.1),
          ${misc:Depends},
          ${shlibs:Depends},
@@ -60,11 +60,11 @@
 Package: qtdeclarative5-ubuntu-contacts0.1
 Architecture: any
 Depends: qtdeclarative5-accounts-plugin,
-         qtdeclarative5-online-accounts-client0.1,
-         qtdeclarative5-qtquick2-plugin,
+         qml-module-ubuntu-onlineaccounts-client,
+         qml-module-qtquick2,
          qtdeclarative5-ubuntu-syncmonitor0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
-         qtdeclarative5-qtcontacts-plugin,
+         qml-module-qtcontacts,
          suru-icon-theme,
          ${misc:Depends},
          ${shlibs:Depends},