GitLab

(cherry picked from commit cd8cfe54)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 68e35b3a)

Also include KDE & ECM cmake modules before checking other deps,
for consistency and to ensure KDE settings are deployed before doing more.

GIT_SILENT

(cherry picked from commit 4375f7da)

(cherry picked from commit 887cab83)

GIT_SILENT

(cherry picked from commit c6c9c941)

(cherry picked from commit aaa8d64e)

(cherry picked from commit 63fe9d87)

(cherry picked from commit d991a968)

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

Also add/move license files as required by REUSE specification

GIT_SILENT

GIT_SILENT

(cherry picked from commit 99afe9c6)

(cherry picked from commit 53d4b86d)

(cherry picked from commit 3aa1e07d)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 14b7e206)

(cherry picked from commit 79534f7f)