[neon/neon/calamares-settings/Neon/release-lts] /: move python module out of local search path

[Harald Sitter]

Git commit 7f43d288cf5029b0767a1e3a5a65e29f6a8d15ce by Harald Sitter.
Committed on 15/03/2021 at 15:28.
Pushed by sitter into branch 'Neon/release-lts'.

move python module out of local search path

local includes multiarch triplets for us which is kinda meh, instead
manually ad a search path for calamares in /usr/share and put the python
module we have in there

this way the package is correctly arch=all while still able to find this
bespoke module. seems to have no unintended side effects

M  +2    -2    desktop/calamares/desktop/settings.conf
R  +0    -0    desktop/usr/share/calamares/modules/neon-fs-cleanup/main.py [from: desktop/usr/lib/x86_64-linux-gnu/calamares/modules/neon-fs-cleanup/main.py - 100% similarity]
R  +0    -0    desktop/usr/share/calamares/modules/neon-fs-cleanup/module.desc [from: desktop/usr/lib/x86_64-linux-gnu/calamares/modules/neon-fs-cleanup/module.desc - 100% similarity]
M  +2    -2    oem-prepare/calamares/oem-prepare/settings.conf

https://invent.kde.org/neon/neon/calamares-settings/commit/7f43d288cf5029b0767a1e3a5a65e29f6a8d15ce

diff --git a/desktop/calamares/desktop/settings.conf b/desktop/calamares/desktop/settings.conf
index 55eb65d..d80c69b 100644
--- a/desktop/calamares/desktop/settings.conf
+++ b/desktop/calamares/desktop/settings.conf
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2018-2020 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2018-2021 Harald Sitter <sitter at kde.org>
 # SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
 # SPDX-FileCopyrightText: 2016 Rohan Garg <rohan at kde.org>
 ---
-modules-search: [ local ]
+modules-search: [ local, /usr/share/calamares/modules ]
 
 instances:
 - id:       install_translations
diff --git a/desktop/usr/lib/x86_64-linux-gnu/calamares/modules/neon-fs-cleanup/main.py b/desktop/usr/share/calamares/modules/neon-fs-cleanup/main.py
similarity index 100%
rename from desktop/usr/lib/x86_64-linux-gnu/calamares/modules/neon-fs-cleanup/main.py
rename to desktop/usr/share/calamares/modules/neon-fs-cleanup/main.py
diff --git a/desktop/usr/lib/x86_64-linux-gnu/calamares/modules/neon-fs-cleanup/module.desc b/desktop/usr/share/calamares/modules/neon-fs-cleanup/module.desc
similarity index 100%
rename from desktop/usr/lib/x86_64-linux-gnu/calamares/modules/neon-fs-cleanup/module.desc
rename to desktop/usr/share/calamares/modules/neon-fs-cleanup/module.desc
diff --git a/oem-prepare/calamares/oem-prepare/settings.conf b/oem-prepare/calamares/oem-prepare/settings.conf
index 2b155d5..36f99af 100644
--- a/oem-prepare/calamares/oem-prepare/settings.conf
+++ b/oem-prepare/calamares/oem-prepare/settings.conf
@@ -1,7 +1,7 @@
-# SPDX-FileCopyrightText: 2018-2019 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2018-2021 Harald Sitter <sitter at kde.org>
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 ---
-modules-search: [ local ]
+modules-search: [ local, /usr/share/calamares/modules ]
 
 instances:
 - id: logs