Merge lp:~renatofilho/mediaplayer-app/revert-ffmpeg into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Added gstreamer0.10-ffmpeg as dependency (temporary solution).

[Gustavo Pichorim Boiko (boiko)]

5 +mediaplayer-app (0.20.6) quantal; urgency=low

Please change it to version 0.20.6-0ubuntu1 and set as UNRELEASED. The changes are going to be automatically released due to the daily releasing.

review: Needs Fixing

[lp:~renatofilho/mediaplayer-app/revert-ffmpeg]

79. By Renato Araujo Oliveira Filho on 2013-04-24

Fixed changelog to works with daily releases.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/37

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-23 20:56:12 +0000
+++ debian/changelog	2013-04-24 18:20:32 +0000
@@ -1,3 +1,9 @@
+mediaplayer-app (0.20.5-0ubuntu1) UNRELEASED; urgency=low
+
+  * Added gstreamer0.10-ffmpeg into dependency list.
+
+ -- Renato Araujo Oliveira Filho <[e-mail]>  Wed, 24 Apr 2013 14:43:16 -0300
+
 mediaplayer-app (0.20.5) quantal; urgency=low
 
   [ Didier Roche ]

=== modified file 'debian/control'
--- debian/control	2013-04-24 12:15:42 +0000
+++ debian/control	2013-04-24 18:20:32 +0000
@@ -24,6 +24,7 @@
          ${shlibs:Depends},
          gstreamer0.10-plugins-base,
          gstreamer0.10-plugins-good,
+         gstreamer0.10-ffmpeg,
          qtdeclarative5-hud1.0,
          qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,