From 46ca602a3ffbffab1007552ca32948954447c691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Thu, 16 Apr 2020 19:32:22 +0200 Subject: [PATCH] Ship metainfo files with plugins so we don't have to maintain them twice, once here, once in flathub repo. --- flatpak/org.gajim.Gajim.Plugin.omemo.yaml | 2 +- flatpak/org.gajim.Gajim.Plugin.openpgp.yaml | 2 +- flatpak/org.gajim.Gajim.Plugin.pgp.yaml | 2 +- flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml | 2 +- flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml | 2 +- {flatpak => omemo}/org.gajim.Gajim.Plugin.omemo.metainfo.xml | 0 .../org.gajim.Gajim.Plugin.openpgp.metainfo.xml | 0 {flatpak => pgp}/org.gajim.Gajim.Plugin.pgp.metainfo.xml | 0 .../org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml | 0 .../org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml | 0 10 files changed, 5 insertions(+), 5 deletions(-) rename {flatpak => omemo}/org.gajim.Gajim.Plugin.omemo.metainfo.xml (100%) rename {flatpak => openpgp}/org.gajim.Gajim.Plugin.openpgp.metainfo.xml (100%) rename {flatpak => pgp}/org.gajim.Gajim.Plugin.pgp.metainfo.xml (100%) rename {flatpak => syntax_highlight}/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml (100%) rename {flatpak => url_image_preview}/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml (100%) diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml index 825c461..d8b0679 100644 --- a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml @@ -64,7 +64,7 @@ modules: url: https://ftp.gajim.org/plugins_releases/omemo_2.6.75.zip sha256: 1e090db7efd4473238a2a658e57039b306e1152fa3ba9be5f7b5f3f22460decb - type: file - path: org.gajim.Gajim.Plugin.omemo.metainfo.xml + path: ../omemo/org.gajim.Gajim.Plugin.omemo.metainfo.xml sha256: 795eabeddcee3338a627f84068ee07e8221cca4ae91c08030ffb57fdcccf750b - type: shell commands: diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml index 6221811..943c13a 100644 --- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml @@ -23,7 +23,7 @@ modules: url: https://ftp.gajim.org/plugins_releases/openpgp_1.2.9.zip sha256: fa2e4eca694735a184359712dd6bfe30183aed5e17fc9b6b7d043ada9d444b15 - type: file - path: org.gajim.Gajim.Plugin.openpgp.metainfo.xml + path: ../openpgp/org.gajim.Gajim.Plugin.openpgp.metainfo.xml sha256: 4769307f972aca3320311c1b0e514a7e41f1d1f437887147eb84ff1ec3245203 - type: shell commands: diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml index 42f57af..a009be1 100644 --- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml @@ -24,7 +24,7 @@ modules: url: https://ftp.gajim.org/plugins_releases/pgp_1.2.42.zip sha256: f221642f8590c0ac0a90c0c5f8983485bd95a485fbfc5486dbdc67dc747358aa - type: file - path: org.gajim.Gajim.Plugin.pgp.metainfo.xml + path: ../pgp/org.gajim.Gajim.Plugin.pgp.metainfo.xml sha256: fa574af0b79ae62599d6d7c9c4016742de3b1b4b10890f66b096b7581dfe593d - type: shell commands: diff --git a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml index 19c0772..35d8d79 100644 --- a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml @@ -32,7 +32,7 @@ modules: url: https://ftp.gajim.org/plugins_releases/syntax_highlight_1.2.5.zip sha256: cae16ea749ac3a12341591078c1eb4b6fc6e7dc8123c0964a77adba8285d68dc - type: file - path: org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml + path: ../syntax_highlight/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml sha256: 46bff3ab0a5d97a252652b5d2224e973f4f9e5bdffb9a7a9196b07fca0255957 - type: shell commands: diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml index 7fdad7b..c1169e9 100644 --- a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml @@ -24,7 +24,7 @@ modules: url: https://ftp.gajim.org/plugins_releases/url_image_preview_2.4.2.zip sha256: cd49437b8847f58842b1e0da4b57962ae4ee7feb7fbb831c17e56dfbdf0d2b6e - type: file - path: org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml + path: ../url_image_preview/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml sha256: 4e4966951ae64ef6c6ae159cc2f46195e6f8d42677d7b059f06816c661400f43 - type: shell commands: diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.metainfo.xml b/omemo/org.gajim.Gajim.Plugin.omemo.metainfo.xml similarity index 100% rename from flatpak/org.gajim.Gajim.Plugin.omemo.metainfo.xml rename to omemo/org.gajim.Gajim.Plugin.omemo.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.metainfo.xml b/openpgp/org.gajim.Gajim.Plugin.openpgp.metainfo.xml similarity index 100% rename from flatpak/org.gajim.Gajim.Plugin.openpgp.metainfo.xml rename to openpgp/org.gajim.Gajim.Plugin.openpgp.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.metainfo.xml b/pgp/org.gajim.Gajim.Plugin.pgp.metainfo.xml similarity index 100% rename from flatpak/org.gajim.Gajim.Plugin.pgp.metainfo.xml rename to pgp/org.gajim.Gajim.Plugin.pgp.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml b/syntax_highlight/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml similarity index 100% rename from flatpak/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml rename to syntax_highlight/org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml b/url_image_preview/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml similarity index 100% rename from flatpak/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml rename to url_image_preview/org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml