Merge lp:~bfiller/mediaplayer-app/update-changelog into lp:mediaplayer-app

[Bill Filler]

update changelog to match what is in archive

update changelog to match what is in archive

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:377
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/276/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5953
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5953/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26440

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-01 21:53:38 +0000
+++ debian/changelog	2016-01-05 21:35:26 +0000
@@ -1,3 +1,9 @@
+mediaplayer-app (0.20.5+15.10.20150701-0ubuntu2~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <[e-mail]>  Wed, 15 Jul 2015 15:40:26 +0000
+
 mediaplayer-app (0.20.5+15.10.20150701-0ubuntu1) wily; urgency=medium
 
   [ Bill Filler ]