Thumbnailer

Merge lp://staging/~michihenning/thumbnailer/licensecheck into lp://staging/thumbnailer/devel

  1. licensecheck
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 359
Merged at revision: 356
Proposed branch: lp://staging/~michihenning/thumbnailer/licensecheck
Merge into: lp://staging/thumbnailer/devel
Diff against target: 368 lines (+229/-10)
15 files modified
debian/changelog (+7/-0)
man/thumbnailer-admin.1 (+18/-0)
man/thumbnailer-service.1 (+18/-0)
man/thumbnailer-settings.5 (+18/-0)
tests/CMakeLists.txt (+5/-3)
tests/copyright/check_copyright.sh (+1/-7)
tests/qml/Fixture.qml (+18/-0)
tests/qml/tst_albumart.qml (+18/-0)
tests/qml/tst_embedded_albumart.qml (+18/-0)
tests/qml/tst_photo.qml (+18/-0)
tests/slow-vs-thumb/slow/vs-thumb (+18/-0)
tests/thumbnailer/vs-thumb-crash/vs-thumb (+18/-0)
tests/thumbnailer/vs-thumb-exit-1/vs-thumb (+18/-0)
tests/thumbnailer/vs-thumb-exit-2/vs-thumb (+18/-0)
tests/thumbnailer/vs-thumb-exit-99/vs-thumb (+18/-0)
To merge this branch: bzr merge lp://staging/~michihenning/thumbnailer/licensecheck
Reviewer Review Type Date Requested Status
James Henstridge Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+290557@code.staging.launchpad.net

Commit message

Re-enable copyright/licence test for xenial.

Description of the change

Re-enable copyright/licence test for xenial.

To post a comment you must log in.
lp://staging/~michihenning/thumbnailer/licensecheck updated
356. By Michi Henning

Added a nother exclusion to copyright test.

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

FAILED: Continuous integration, rev:356
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/684/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-amd64-ci/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/389
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/389/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-i386-ci/389
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-amd64-ci/138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-i386-ci/136/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/684/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~michihenning/thumbnailer/licensecheck updated
357. By Michi Henning

Fixed a few more issues with the copyright test and missing copyright headers.

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

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/686/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-amd64-ci/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/391
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-i386-ci/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-i386-ci/138

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/686/rebuild

review: Approve (continuous-integration)
lp://staging/~michihenning/thumbnailer/licensecheck updated
358. By Michi Henning

Merged devel.

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

PASSED: Continuous integration, rev:358
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/688/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-amd64-ci/392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/393
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-i386-ci/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-i386-ci/140

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/688/rebuild

review: Approve (continuous-integration)
lp://staging/~michihenning/thumbnailer/licensecheck updated
359. By Michi Henning

Fixed changelog.

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

PASSED: Continuous integration, rev:359
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/689/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-amd64-ci/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/394
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/394/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-i386-ci/394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/144
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-i386-ci/141

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/689/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: