From 29e62fee6ee82ee6eb2c6d7953eeabb8f26f5bfd Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Tue, 18 Oct 2022 17:49:49 +0200 Subject: [PATCH] Trying to fix deb build --- .../qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir | 1 - linux/flatpak | 2 +- setup.py | 11 +++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir index 1478c34..cc26d7a 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/qmldir @@ -3,4 +3,3 @@ module eu.ad5001.LogarithmPlotter.ObjectLists ObjectLists 1.0 ObjectLists.qml ObjectCreationGrid 1.0 ObjectCreationGrid.qml ObjectRow 1.0 ObjectRow.qml -EditorDialog 1.0 EditorDialog.qml diff --git a/linux/flatpak b/linux/flatpak index a23d256..f215689 160000 --- a/linux/flatpak +++ b/linux/flatpak @@ -1 +1 @@ -Subproject commit a23d256b5838751f6aadaa9281aceee9ba058047 +Subproject commit f215689b354e07b0fc2e6ad6d0213fe873d497dc diff --git a/setup.py b/setup.py index e3fb347..ea494cc 100644 --- a/setup.py +++ b/setup.py @@ -100,6 +100,8 @@ if sys.platform == 'linux': data_files.append((os.environ["PREFIX"] + '/mime/packages/', ['linux/x-logarithm-plot.xml'])) data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', ['linux/application-x-logarithm-plot.svg'])) data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', ['logplotter.svg'])) + if "FLATPAK_INSTALL" not in os.environ: + data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', ['logplotter.svg'])) if len(sys.argv) > 1: if sys.argv[1] == "install": os.makedirs(os.environ["PREFIX"] + '/applications/', exist_ok=True) @@ -111,14 +113,7 @@ if sys.platform == 'linux': copyfile(current_dir + '/linux/application-x-logarithm-plot.svg', os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg') copyfile(current_dir + '/logplotter.svg', os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg') - if "FLATPAK_INSTALL" in os.environ: - copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml', - os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml') - copyfile(current_dir + '/linux/flatpak/logarithmplotter.desktop', - os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') - else: - copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.xml', - os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml') + #copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.xml', os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml') #copyfile(current_dir + '/linux/logarithmplotter.desktop', os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') elif sys.argv[1] == "uninstall": os.remove(os.environ["PREFIX"] + '/applications/logarithmplotter.desktop')