GitLab

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"

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 23dc437b)

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"

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"

* Update date and version numbers
* Suitable tagging and a fix

(cherry picked from commit 29deb5d9)

GIT_SILENT

(cherry picked from commit cec4fabd)

(cherry picked from commit 1d99e93f)

(cherry picked from commit c4c319d1)

(cherry picked from commit a20f95b8)

GIT_SILENT

(cherry picked from commit c02c24ea)

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

Also add/move license files as required by REUSE specification

GIT_SILENT

(cherry picked from commit d6741b7c)

(cherry picked from commit b5ba2d13)

(cherry picked from commit a40154f6)

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"