Merge lp:~ahayzen/ubuntu-printing-app/fix-1673808-MIR-comments into lp:ubuntu-printing-app

[Andrew Hayzen]

* Change qtdeclarative5-ubuntu-ui-toolkit-plugin to qml-module-ubuntu-components in depends (and -gles)

* Change qtdeclarative5-ubuntu-ui-toolkit-plugin to qml-module-ubuntu-components in depends (and -gles)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-03-24 15:28:54 +0000
+++ debian/control	2017-03-24 15:28:54 +0000
@@ -23,10 +23,10 @@
                qml-module-qtquick2,
                qml-module-qtquick-layouts,
                qml-module-qttest,
+               qml-module-ubuntu-components (>= 1.3) | qml-module-ubuntu-components-gles (>= 1.3),
                qml-module-ubuntu-test,
                qtdeclarative5-ubuntu-content1,
                qtdeclarative5-ubuntu-ui-extras0.2,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                xvfb
@@ -38,9 +38,9 @@
 Architecture: any
 Depends: qml-module-qtquick2,
          qml-module-qtquick-layouts,
+         qml-module-ubuntu-components (>= 1.3) | qml-module-ubuntu-components-gles (>= 1.3),
          qtdeclarative5-ubuntu-content1,
          qtdeclarative5-ubuntu-ui-extras0.2,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Printing app which consumes a PDF from content-hub