mediaplayer-app

Merge lp:~renatofilho/mediaplayer-app/fix-images-copyright into lp:mediaplayer-app

  1. fix-images-copyright
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 115
Merged at revision: 278
Proposed branch: lp:~renatofilho/mediaplayer-app/fix-images-copyright
Merge into: lp:mediaplayer-app
Diff against target: 25 lines (+11/-0)
1 file modified
debian/copyright (+11/-0)
To merge this branch: bzr merge lp:~renatofilho/mediaplayer-app/fix-images-copyright
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+172322@code.launchpad.net

Commit message

Fixed images copyright.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/73/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/514
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/516
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/516/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/466

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/882/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/757

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-autolanding/72/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/179
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/173/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-autolanding/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-autolanding/2
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-autolanding/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-autolanding/2
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/179
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/173
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/173/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2796/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2847/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/632
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/631

review: Needs Fixing (continuous-integration)
lp:~renatofilho/mediaplayer-app/fix-images-copyright updated
115. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/230/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4214
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4214/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/copyright'
2--- debian/copyright 2013-07-16 16:26:53 +0000
3+++ debian/copyright 2014-10-02 14:09:01 +0000
4@@ -10,6 +10,10 @@
5 Copyright: 2013 Canonical Ltd.
6 License: LGPL-3
7
8+Files: src/qml/theme/artwork/* src/qml/player/artwork/*
9+Copyright: 2013 Canonical Ltd.
10+License: CC-BY-SA-3.0
11+
12 License: GPL-3
13 This program is free software: you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by
15@@ -42,3 +46,10 @@
16 .
17 On Debian systems, the complete text of the GNU Lesser General
18 Public License can be found in "/usr/share/common-licenses/LGPL-3".
19+
20+License: CC-BY-SA-3.0
21+ This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
22+ Unported License. To view a copy of this license, visit
23+ http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
24+ Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
25+

Subscribers

People subscribed via source and target branches