Merge lp:~timo-jyrinki/ubuntu-html5-theme/stop_depending_on_transitional_packages into lp:ubuntu-html5-theme

[Timo Jyrinki]

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/185/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-wily-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-wily-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/185/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

214. By Timo Jyrinki on 2016-05-18

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

=== modified file 'debian/control'
--- debian/control	2015-06-04 21:55:47 +0000
+++ debian/control	2016-05-18 12:52:17 +0000
@@ -11,9 +11,9 @@
                qt5-qmake,
 	       qtbase5-dev (>= 5.4),
                qtdeclarative5-dev,
-               qtdeclarative5-qtquick2-plugin,
-               qml-module-qttest | qtdeclarative5-test-plugin,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin,
+               qml-module-qtquick2,
+               qml-module-qttest,
+               qml-module-ubuntu-components,
 Standards-Version: 3.9.5
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
@@ -47,7 +47,7 @@
 Depends: libjs-jquery,
          liboxideqt-qmlplugin (>= 1.2.0),
          qmlscene,
-         qtdeclarative5-qtquick2-plugin,
+         qml-module-qtquick2,
          ubuntu-html5-ui-toolkit (= ${binary:Version}),
          ${misc:Depends},
 Replaces: ubuntu-html5-theme-examples (<< 0.1.1),
@@ -67,8 +67,8 @@
          python3-xlib,
          python3-autopilot,
          qmlscene,
-         qtdeclarative5-qtquick2-plugin,
-         qml-module-qttest | qtdeclarative5-test-plugin,
+         qml-module-qtquick2,
+         qml-module-qttest,
          ubuntu-html5-ui-toolkit (= ${binary:Version}),
          ubuntu-html5-ui-toolkit-examples (= ${binary:Version}),
          ${misc:Depends},
@@ -84,7 +84,7 @@
 Multi-Arch: foreign
 Depends: liboxideqt-qmlplugin (>= 1.3.5),
          qmlscene,
-         qtdeclarative5-qtquick2-plugin,
+         qml-module-qtquick2,
          qtdeclarative5-ubuntu-ui-extras-browser-plugin,
          ubuntu-html5-ui-toolkit (= ${source:Version}),
          unity-webapps-qml (>= 0.1+14.04.20131106-0ubuntu2),
@@ -99,7 +99,7 @@
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
          liboxideqt-qmlplugin (>= 1.2.0),
-         qtdeclarative5-qtquick2-plugin,
+         qml-module-qtquick2,
          ubuntu-html5-container (>= ${binary:Version}),
          python3-autopilot,
          ${misc:Depends},