Merge lp:~timo-jyrinki/ubuntu-system-settings-online-accounts/stop_depending_on_transitional_packages into lp:ubuntu-system-settings-online-accounts

[Timo Jyrinki]

Stop depending on transitional packages. (LP: #1583079)

[Alberto Mardegan (mardy)]

LGTM, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:353
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/294/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/1008/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/1008/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/294/rebuild

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/ubuntu-system-settings-online-accounts/stop_depending_on_transitional_packages]

354. By Timo Jyrinki on 2016-05-18

fix too much automation...

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-02-16 07:54:56 +0000
+++ debian/control	2016-05-18 12:58:18 +0000
@@ -17,10 +17,10 @@
                qt5-default,
                qtbase5-dev (>= 5.4),
                qtdeclarative5-dev,
-               qtdeclarative5-accounts-plugin,
-               qtdeclarative5-qtquick2-plugin,
-               qtdeclarative5-test-plugin,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin,
+               qml-module-ubuntu-onlineaccounts,
+               qml-module-qtquick2,
+               qml-module-qttest,
+               qml-module-ubuntu-components,
                signon-plugins-dev (>= 8.58),
                dbus-test-runner,
                xmldiff,
@@ -42,8 +42,8 @@
          libonline-accounts-daemon1,
          liboxideqt-qmlplugin (>= 1.2.0) [!arm64 !powerpc !ppc64el !s390x],
          qml-module-ubuntu-onlineaccounts2,
-         qtdeclarative5-accounts-plugin (>= 0.6),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
+         qml-module-ubuntu-onlineaccounts (>= 0.6),
+         qml-module-ubuntu-components | qml-module-ubuntu-components-gles,
          signon-ui-service,
          ubuntu-system-settings
 Conflicts: account-plugin-windows-live, online-accounts-daemon
@@ -89,7 +89,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         qtdeclarative5-qtquick2-plugin,
+         qml-module-qtquick2,
 Breaks: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
 Replaces: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
 Description: Online Accounts panel library for QML applications