Merge lp:~diwic/mediaplayer-app/remove-qtubuntu-media into lp:mediaplayer-app

[David Henningsson]

Remove dependency on qtubuntu-media (not wanted on PulseAudio image)

When switching over to using GStreamer / PulseAudio / ALSA, we don't need this package anymore. I want to remove it in the PulseAudio image now. If it is needed for other images, it should be added to those seeds instead.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:122
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~diwic/mediaplayer-app/remove-qtubuntu-media/+merge/177719/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1733
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1733/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1472

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/81/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/82/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/18/console
    None: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/18/console
    None: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/82/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1774
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1779
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1779/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1512
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/6
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/6
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/83/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-06-11 14:25:18 +0000
+++ debian/control	2013-07-30 23:24:27 +0000
@@ -31,7 +31,6 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-window-plugin,
          qtdeclarative5-xmllistmodel-plugin,
-         qtubuntu-media[armhf] | mediaplayerplugin-aal[armhf],
 Conflicts: media-player
 Replaces: media-player
 Provides: media-player