Merge lp:~timo-jyrinki/mediaplayer-app/stop_depending_on_transitional_packages into lp:mediaplayer-app

[Timo Jyrinki]

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

Unmerged revisions

417. By Timo Jyrinki on 2016-05-18

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

=== modified file 'debian/control'
--- debian/control	2016-04-28 15:02:04 +0000
+++ debian/control	2016-05-18 10:30:15 +0000
@@ -25,9 +25,9 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
-         qtdeclarative5-window-plugin,
-         qtdeclarative5-xmllistmodel-plugin,
+         qml-module-ubuntu-components | qml-module-ubuntu-components-gles,
+         qml-module-qtquick-window2,
+         qml-module-qtquick-xmllistmodel,
 Conflicts: media-player
 Replaces: media-player
 Provides: media-player