From 5ba449454b53f0bae1d8132dd344ada1a6d49a28 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 26 Sep 2023 08:39:32 +0300 Subject: [PATCH 39/39] Rename org.freeciv.mp. as org.freeciv..mp See osdn #48729 Signed-off-by: Marko Lindqvist --- bootstrap/Makefile.am | 24 +++++++++---------- ...k3.desktop => org.freeciv.gtk3.mp.desktop} | 0 ...in => org.freeciv.gtk3.mp.metainfo.xml.in} | 4 ++-- ...k4.desktop => org.freeciv.gtk4.mp.desktop} | 0 ...in => org.freeciv.gtk4.mp.metainfo.xml.in} | 4 ++-- ...p.qt.desktop => org.freeciv.qt.mp.desktop} | 0 ...l.in => org.freeciv.qt.mp.metainfo.xml.in} | 4 ++-- meson.build | 12 +++++----- platforms/flatpak/build_flatpak.sh | 8 +++---- ...iv.mp.gtk3.yml => org.freeciv.gtk3.mp.yml} | 2 +- ...iv.mp.gtk4.yml => org.freeciv.gtk4.mp.yml} | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) rename bootstrap/{org.freeciv.mp.gtk3.desktop => org.freeciv.gtk3.mp.desktop} (100%) rename bootstrap/{org.freeciv.mp.gtk3.metainfo.xml.in => org.freeciv.gtk3.mp.metainfo.xml.in} (94%) rename bootstrap/{org.freeciv.mp.gtk4.desktop => org.freeciv.gtk4.mp.desktop} (100%) rename bootstrap/{org.freeciv.mp.gtk4.metainfo.xml.in => org.freeciv.gtk4.mp.metainfo.xml.in} (94%) rename bootstrap/{org.freeciv.mp.qt.desktop => org.freeciv.qt.mp.desktop} (100%) rename bootstrap/{org.freeciv.mp.qt.metainfo.xml.in => org.freeciv.qt.mp.metainfo.xml.in} (94%) rename platforms/flatpak/{org.freeciv.mp.gtk3.yml => org.freeciv.gtk3.mp.yml} (94%) rename platforms/flatpak/{org.freeciv.mp.gtk4.yml => org.freeciv.gtk4.mp.yml} (94%) diff --git a/bootstrap/Makefile.am b/bootstrap/Makefile.am index 1134bb5d6b..de68228b97 100644 --- a/bootstrap/Makefile.am +++ b/bootstrap/Makefile.am @@ -27,18 +27,18 @@ EXTRA_DIST = freeciv.project \ org.freeciv.sdl2.desktop \ org.freeciv.qt.desktop \ org.freeciv.server.desktop \ - org.freeciv.mp.gtk3.desktop \ - org.freeciv.mp.gtk4.desktop \ - org.freeciv.mp.qt.desktop \ + org.freeciv.gtk3.mp.desktop \ + org.freeciv.gtk4.mp.desktop \ + org.freeciv.qt.mp.desktop \ org.freeciv.ruledit.desktop \ org.freeciv.gtk322.metainfo.xml.in \ org.freeciv.gtk4.metainfo.xml.in \ org.freeciv.sdl2.metainfo.xml.in \ org.freeciv.qt.metainfo.xml.in \ org.freeciv.server.metainfo.xml.in \ - org.freeciv.mp.gtk3.metainfo.xml.in \ - org.freeciv.mp.gtk4.metainfo.xml.in \ - org.freeciv.mp.qt.metainfo.xml.in \ + org.freeciv.gtk3.mp.metainfo.xml.in \ + org.freeciv.gtk4.mp.metainfo.xml.in \ + org.freeciv.qt.mp.metainfo.xml.in \ org.freeciv.ruledit.metainfo.xml.in \ config.rpath \ Makerules.mk \ @@ -73,18 +73,18 @@ desktopfile_DATA += org.freeciv.qt.desktop endif if MODINST_GTK3 -metainfofile_DATA += org.freeciv.mp.gtk3.metainfo.xml -desktopfile_DATA += org.freeciv.mp.gtk3.desktop +metainfofile_DATA += org.freeciv.gtk3.mp.metainfo.xml +desktopfile_DATA += org.freeciv.gtk3.mp.desktop endif if MODINST_GTK4 -metainfofile_DATA += org.freeciv.mp.gtk4.metainfo.xml -desktopfile_DATA += org.freeciv.mp.gtk4.desktop +metainfofile_DATA += org.freeciv.gtk4.mp.metainfo.xml +desktopfile_DATA += org.freeciv.gtk4.mp.desktop endif if MODINST_QT -metainfofile_DATA += org.freeciv.mp.qt.metainfo.xml -desktopfile_DATA += org.freeciv.mp.qt.desktop +metainfofile_DATA += org.freeciv.qt.mp.metainfo.xml +desktopfile_DATA += org.freeciv.qt.mp.desktop endif if RULEDIT diff --git a/bootstrap/org.freeciv.mp.gtk3.desktop b/bootstrap/org.freeciv.gtk3.mp.desktop similarity index 100% rename from bootstrap/org.freeciv.mp.gtk3.desktop rename to bootstrap/org.freeciv.gtk3.mp.desktop diff --git a/bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in b/bootstrap/org.freeciv.gtk3.mp.metainfo.xml.in similarity index 94% rename from bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in rename to bootstrap/org.freeciv.gtk3.mp.metainfo.xml.in index 7a7ad972a3..3c5a87c82a 100644 --- a/bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in +++ b/bootstrap/org.freeciv.gtk3.mp.metainfo.xml.in @@ -1,7 +1,7 @@ Freeciv gtk+-3 modpack installer - org.freeciv.mp.gtk3 + org.freeciv.gtk3.mp GPL-2.0-or-later CC0 Gtk+-3 based modpack installer for the Freeciv game @@ -14,7 +14,7 @@ Freeciv modpack utility can be used to automatically download and install custom rulesets, tilesets, soundsets, and maps for freeciv to use.

- org.freeciv.mp.gtk3.desktop + org.freeciv.gtk3.mp.desktop https://www.freeciv.org/ https://osdn.net/projects/freeciv/ticket/ diff --git a/bootstrap/org.freeciv.mp.gtk4.desktop b/bootstrap/org.freeciv.gtk4.mp.desktop similarity index 100% rename from bootstrap/org.freeciv.mp.gtk4.desktop rename to bootstrap/org.freeciv.gtk4.mp.desktop diff --git a/bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in b/bootstrap/org.freeciv.gtk4.mp.metainfo.xml.in similarity index 94% rename from bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in rename to bootstrap/org.freeciv.gtk4.mp.metainfo.xml.in index b31e6fef5d..65f5c93d58 100644 --- a/bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in +++ b/bootstrap/org.freeciv.gtk4.mp.metainfo.xml.in @@ -1,7 +1,7 @@ Freeciv gtk-4 modpack installer - org.freeciv.mp.gtk4 + org.freeciv.gtk4.mp GPL-2.0-or-later CC0 Gtk-4 based modpack installer for the Freeciv game @@ -14,7 +14,7 @@ Freeciv modpack utility can be used to automatically download and install custom rulesets, tilesets, soundsets, and maps for freeciv to use.

- org.freeciv.mp.gtk4.desktop + org.freeciv.gtk4.mp.desktop https://www.freeciv.org/ https://osdn.net/projects/freeciv/ticket/ diff --git a/bootstrap/org.freeciv.mp.qt.desktop b/bootstrap/org.freeciv.qt.mp.desktop similarity index 100% rename from bootstrap/org.freeciv.mp.qt.desktop rename to bootstrap/org.freeciv.qt.mp.desktop diff --git a/bootstrap/org.freeciv.mp.qt.metainfo.xml.in b/bootstrap/org.freeciv.qt.mp.metainfo.xml.in similarity index 94% rename from bootstrap/org.freeciv.mp.qt.metainfo.xml.in rename to bootstrap/org.freeciv.qt.mp.metainfo.xml.in index 3ae473565b..6c433b16bc 100644 --- a/bootstrap/org.freeciv.mp.qt.metainfo.xml.in +++ b/bootstrap/org.freeciv.qt.mp.metainfo.xml.in @@ -1,7 +1,7 @@ Freeciv Qt modpack installer - org.freeciv.mp.qt + org.freeciv.qt.mp GPL-2.0-or-later CC0 Qt based modpack installer for the Freeciv game @@ -14,7 +14,7 @@ Freeciv modpack utility can be used to automatically download and install custom rulesets, tilesets, soundsets, and maps for freeciv to use.

- org.freeciv.mp.qt.desktop + org.freeciv.qt.mp.desktop https://www.freeciv.org/ https://osdn.net/projects/freeciv/ticket/ diff --git a/meson.build b/meson.build index b2d28cfd9e..a8e1306567 100644 --- a/meson.build +++ b/meson.build @@ -3963,12 +3963,12 @@ executable('freeciv-mp-gtk3', ) install_data( - 'bootstrap/org.freeciv.mp.gtk3.desktop', + 'bootstrap/org.freeciv.gtk3.mp.desktop', install_dir : join_paths(get_option('prefix'), 'share/applications') ) custom_target('mi_mp_gtk3', - input: 'bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in', + input: 'bootstrap/org.freeciv.gtk3.mp.metainfo.xml.in', output: '@BASENAME@', command: [sh_exe, files('bootstrap/generate_metainfo.sh'), '@OUTPUT@', b_root, 'development'], @@ -3998,12 +3998,12 @@ executable('freeciv-mp-gtk4', ) install_data( - 'bootstrap/org.freeciv.mp.gtk4.desktop', + 'bootstrap/org.freeciv.gtk4.mp.desktop', install_dir : join_paths(get_option('prefix'), 'share/applications') ) custom_target('mi_mp_gtk4', - input: 'bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in', + input: 'bootstrap/org.freeciv.gtk4.mp.metainfo.xml.in', output: '@BASENAME@', command: [sh_exe, files('bootstrap/generate_metainfo.sh'), '@OUTPUT@', b_root, 'development'], @@ -4061,12 +4061,12 @@ executable('freeciv-mp-qt', ) install_data( - 'bootstrap/org.freeciv.mp.qt.desktop', + 'bootstrap/org.freeciv.qt.mp.desktop', install_dir : join_paths(get_option('prefix'), 'share/applications') ) custom_target('mi_mp_qt', - input: 'bootstrap/org.freeciv.mp.qt.metainfo.xml.in', + input: 'bootstrap/org.freeciv.qt.mp.metainfo.xml.in', output: '@BASENAME@', command: [sh_exe, files('bootstrap/generate_metainfo.sh'), '@OUTPUT@', b_root, 'development'], diff --git a/platforms/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh index ff88cddded..83d68d8301 100755 --- a/platforms/flatpak/build_flatpak.sh +++ b/platforms/flatpak/build_flatpak.sh @@ -18,16 +18,16 @@ FCVER=$(../../fc_version) if ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk4.yml || ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk322.yml || - ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.mp.gtk4.yml || - ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.mp.gtk3.yml || + ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk4.mp.yml || + ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.gtk3.mp.yml || ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.qt.yml || ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.sdl2.yml || ! flatpak-builder --user --repo="${BROOT}/repo" --state-dir="${BROOT}/state" --force-clean "${BROOT}/build" org.freeciv.ruledit.yml || ! flatpak build-update-repo "${BROOT}/repo" || ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk4-${FCVER}.flatpak" org.freeciv.gtk4 || ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk3.22-${FCVER}.flatpak" org.freeciv.gtk322 || - ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-mp-gtk4-${FCVER}.flatpak" org.freeciv.mp.gtk4 || - ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-mp-gtk3-${FCVER}.flatpak" org.freeciv.mp.gtk3 || + ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk4-mp-${FCVER}.flatpak" org.freeciv.gtk4.mp || + ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-gtk3-mp-${FCVER}.flatpak" org.freeciv.gtk3.mp || ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-qt-${FCVER}.flatpak" org.freeciv.qt || ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-sdl2-${FCVER}.flatpak" org.freeciv.sdl2 || ! flatpak build-bundle "${BROOT}/repo" "${BROOT}/freeciv-ruledit-${FCVER}.flatpak" org.freeciv.ruledit diff --git a/platforms/flatpak/org.freeciv.mp.gtk3.yml b/platforms/flatpak/org.freeciv.gtk3.mp.yml similarity index 94% rename from platforms/flatpak/org.freeciv.mp.gtk3.yml rename to platforms/flatpak/org.freeciv.gtk3.mp.yml index 7b89e0d783..0467595a1d 100644 --- a/platforms/flatpak/org.freeciv.mp.gtk3.yml +++ b/platforms/flatpak/org.freeciv.gtk3.mp.yml @@ -1,4 +1,4 @@ -app-id: org.freeciv.mp.gtk3 +app-id: org.freeciv.gtk3.mp runtime: org.freedesktop.Platform runtime-version: '23.08' sdk: org.freedesktop.Sdk diff --git a/platforms/flatpak/org.freeciv.mp.gtk4.yml b/platforms/flatpak/org.freeciv.gtk4.mp.yml similarity index 94% rename from platforms/flatpak/org.freeciv.mp.gtk4.yml rename to platforms/flatpak/org.freeciv.gtk4.mp.yml index 77e8721ef4..26a3b8a474 100644 --- a/platforms/flatpak/org.freeciv.mp.gtk4.yml +++ b/platforms/flatpak/org.freeciv.gtk4.mp.yml @@ -1,4 +1,4 @@ -app-id: org.freeciv.mp.gtk4 +app-id: org.freeciv.gtk4.mp runtime: org.gnome.Platform runtime-version: '45' sdk: org.gnome.Sdk -- 2.40.1