Merge lp://qastaging/~alan-griffiths/miral/update-license into lp://qastaging/miral

Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: 573
Merged at revision: 576
Proposed branch: lp://qastaging/~alan-griffiths/miral/update-license
Merge into: lp://qastaging/miral
Diff against target: 2828 lines (+1252/-247)
122 files modified
COPYING.GPL2 (+339/-0)
COPYING.LGPL2 (+481/-0)
COPYING.LGPL3 (+165/-0)
README.md (+1/-1)
debian/copyright (+31/-11)
include/mir/client/blob.h (+3/-3)
include/mir/client/connection.h (+3/-3)
include/mir/client/cookie.h (+3/-3)
include/mir/client/display_config.h (+3/-3)
include/mir/client/surface.h (+3/-3)
include/mir/client/window.h (+3/-3)
include/mir/client/window_id.h (+3/-3)
include/mir/client/window_spec.h (+3/-3)
include/miral/active_outputs.h (+2/-2)
include/miral/add_init_callback.h (+2/-2)
include/miral/append_event_filter.h (+2/-2)
include/miral/application.h (+2/-2)
include/miral/application_authorizer.h (+2/-2)
include/miral/application_info.h (+2/-2)
include/miral/canonical_window_manager.h (+2/-2)
include/miral/command_line_option.h (+2/-2)
include/miral/cursor_theme.h (+2/-2)
include/miral/debug_extension.h (+2/-2)
include/miral/display_configuration_option.h (+2/-2)
include/miral/internal_client.h (+2/-2)
include/miral/keymap.h (+2/-2)
include/miral/output.h (+2/-2)
include/miral/runner.h (+2/-2)
include/miral/set_command_line_handler.h (+2/-2)
include/miral/set_terminator.h (+2/-2)
include/miral/set_window_management_policy.h (+2/-2)
include/miral/window.h (+2/-2)
include/miral/window_info.h (+2/-2)
include/miral/window_management_options.h (+2/-2)
include/miral/window_management_policy.h (+2/-2)
include/miral/window_management_policy_addendum2.h (+2/-2)
include/miral/window_management_policy_addendum3.h (+2/-2)
include/miral/window_manager_tools.h (+2/-2)
include/miral/window_specification.h (+2/-2)
include/miral/workspace_policy.h (+2/-2)
miral-kiosk/kiosk_main.cpp (+1/-1)
miral-kiosk/kiosk_window_manager.cpp (+2/-2)
miral-kiosk/kiosk_window_manager.h (+2/-2)
miral-kiosk/sw_splash.cpp (+2/-2)
miral-kiosk/sw_splash.h (+2/-2)
miral-shell/decoration_provider.cpp (+2/-2)
miral-shell/decoration_provider.h (+2/-2)
miral-shell/floating_window_manager.cpp (+2/-2)
miral-shell/floating_window_manager.h (+2/-2)
miral-shell/shell_main.cpp (+1/-1)
miral-shell/spinner/eglapp.cpp (+1/-1)
miral-shell/spinner/eglapp.h (+1/-1)
miral-shell/spinner/eglspinner.cpp (+1/-1)
miral-shell/spinner/miregl.cpp (+1/-1)
miral-shell/spinner/miregl.h (+1/-1)
miral-shell/spinner/png2header.py (+2/-2)
miral-shell/spinner/splash.h (+2/-2)
miral-shell/tiling_window_manager.cpp (+2/-2)
miral-shell/tiling_window_manager.h (+2/-2)
miral-shell/titlebar_config.cpp (+2/-2)
miral-shell/titlebar_config.h (+2/-2)
miral/active_outputs.cpp (+2/-2)
miral/add_init_callback.cpp (+2/-2)
miral/append_event_filter.cpp (+2/-2)
miral/application.cpp (+2/-2)
miral/application_authorizer.cpp (+2/-2)
miral/application_info.cpp (+2/-2)
miral/basic_window_manager.cpp (+2/-2)
miral/basic_window_manager.h (+2/-2)
miral/both_versions.h (+2/-2)
miral/canonical_window_manager.cpp (+2/-2)
miral/command_line_option.cpp (+2/-2)
miral/coordinate_translator.cpp (+2/-2)
miral/coordinate_translator.h (+2/-2)
miral/cursor_theme.cpp (+2/-2)
miral/debug_extension.cpp (+2/-2)
miral/display_configuration_listeners.cpp (+2/-2)
miral/display_configuration_listeners.h (+2/-2)
miral/display_configuration_option.cpp (+2/-2)
miral/internal_client.cpp (+2/-2)
miral/join_client_threads.h (+2/-2)
miral/keymap.cpp (+2/-2)
miral/mru_window_list.cpp (+2/-2)
miral/mru_window_list.h (+2/-2)
miral/output.cpp (+2/-2)
miral/runner.cpp (+2/-2)
miral/set_command_line_handler.cpp (+2/-2)
miral/set_terminator.cpp (+2/-2)
miral/set_window_management_policy.cpp (+2/-2)
miral/version.h.in (+2/-2)
miral/window.cpp (+2/-2)
miral/window_info.cpp (+2/-2)
miral/window_management_options.cpp (+2/-2)
miral/window_management_policy.cpp (+2/-2)
miral/window_management_trace.cpp (+2/-2)
miral/window_management_trace.h (+2/-2)
miral/window_manager_tools.cpp (+2/-2)
miral/window_manager_tools_implementation.h (+2/-2)
miral/window_specification.cpp (+2/-2)
miral/workspace_policy.cpp (+2/-2)
miral/xcursor_loader.cpp (+2/-2)
miral/xcursor_loader.h (+2/-2)
test/active_outputs.cpp (+2/-2)
test/active_window.cpp (+2/-2)
test/client_mediated_gestures.cpp (+2/-2)
test/display_reconfiguration.cpp (+2/-2)
test/drag_active_window.cpp (+2/-2)
test/drag_and_drop.cpp (+2/-2)
test/modify_window_state.cpp (+2/-2)
test/mru_window_list.cpp (+2/-2)
test/raise_tree.cpp (+2/-2)
test/runner.cpp (+2/-2)
test/select_active_window.cpp (+2/-2)
test/test_server.cpp (+2/-2)
test/test_server.h (+2/-2)
test/test_window_manager_tools.h (+2/-2)
test/window_id.cpp (+2/-2)
test/window_placement.cpp (+2/-2)
test/window_placement_anchors_to_parent.cpp (+2/-2)
test/window_placement_client_api.cpp (+2/-2)
test/window_properties.cpp (+2/-2)
test/workspaces.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/miral/update-license
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+328865@code.qastaging.launchpad.net

Commit message

Change license to (L)GPL version 2 or 3

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:573
https://mir-jenkins.ubuntu.com/job/miral-ci/60/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/94
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5061
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5050
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5050
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5050
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/98
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/98/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/98
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/98/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/98
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/98/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/98
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/98/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/98
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/98/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/98
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/98/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/miral-ci/60/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/miral-autolanding/35/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-miral/99/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1505/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5070
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5059
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5059
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5059
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/103/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/103/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/103/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/103/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/103/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/103
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/103/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

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