From b3f71c7848b38105cde902aaafeef9526517af18 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 11 Jun 2022 10:21:59 +0300 Subject: [PATCH 20/20] Rename ...appdata.xml as ...metainfo.xml See osdn #43688 Signed-off-by: Marko Lindqvist --- bootstrap/Makefile.am | 18 +++++++++--------- ...xml.in => org.freeciv.gtk3.metainfo.xml.in} | 0 ...l.in => org.freeciv.gtk322.metainfo.xml.in} | 0 ....in => org.freeciv.mp.gtk3.metainfo.xml.in} | 0 ....in => org.freeciv.mp.gtk4.metainfo.xml.in} | 0 ...ml.in => org.freeciv.mp.qt.metainfo.xml.in} | 0 ...a.xml.in => org.freeciv.qt.metainfo.xml.in} | 0 ....in => org.freeciv.ruledit.metainfo.xml.in} | 0 ...xml.in => org.freeciv.sdl2.metainfo.xml.in} | 0 ...l.in => org.freeciv.server.metainfo.xml.in} | 0 client/.gitignore | 8 ++++---- client/Makefile.am | 8 ++++---- configure.ac | 18 +++++++++--------- server/.gitignore | 2 +- server/Makefile.am | 2 +- tools/fcmp/.gitignore | 6 +++--- tools/fcmp/Makefile.am | 6 +++--- tools/ruledit/.gitignore | 2 +- tools/ruledit/Makefile.am | 2 +- 19 files changed, 36 insertions(+), 36 deletions(-) rename bootstrap/{org.freeciv.gtk3.appdata.xml.in => org.freeciv.gtk3.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.gtk322.appdata.xml.in => org.freeciv.gtk322.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.mp.gtk3.appdata.xml.in => org.freeciv.mp.gtk3.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.mp.gtk4.appdata.xml.in => org.freeciv.mp.gtk4.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.mp.qt.appdata.xml.in => org.freeciv.mp.qt.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.qt.appdata.xml.in => org.freeciv.qt.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.ruledit.appdata.xml.in => org.freeciv.ruledit.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.sdl2.appdata.xml.in => org.freeciv.sdl2.metainfo.xml.in} (100%) rename bootstrap/{org.freeciv.server.appdata.xml.in => org.freeciv.server.metainfo.xml.in} (100%) diff --git a/bootstrap/Makefile.am b/bootstrap/Makefile.am index 40dbc8a31f..917ec223d6 100644 --- a/bootstrap/Makefile.am +++ b/bootstrap/Makefile.am @@ -26,15 +26,15 @@ EXTRA_DIST = freeciv.project \ org.freeciv.mp.gtk4.desktop.in \ org.freeciv.mp.qt.desktop.in \ org.freeciv.ruledit.desktop.in \ - org.freeciv.gtk3.appdata.xml.in \ - org.freeciv.gtk322.appdata.xml.in \ - org.freeciv.sdl2.appdata.xml.in \ - org.freeciv.qt.appdata.xml.in \ - org.freeciv.server.appdata.xml.in \ - org.freeciv.mp.gtk3.appdata.xml.in \ - org.freeciv.mp.gtk4.appdata.xml.in \ - org.freeciv.mp.qt.appdata.xml.in \ - org.freeciv.ruledit.appdata.xml.in \ + org.freeciv.gtk3.metainfo.xml.in \ + org.freeciv.gtk322.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.ruledit.metainfo.xml.in \ config.rpath \ Makerules.mk \ langnames.txt diff --git a/bootstrap/org.freeciv.gtk3.appdata.xml.in b/bootstrap/org.freeciv.gtk3.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.gtk3.appdata.xml.in rename to bootstrap/org.freeciv.gtk3.metainfo.xml.in diff --git a/bootstrap/org.freeciv.gtk322.appdata.xml.in b/bootstrap/org.freeciv.gtk322.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.gtk322.appdata.xml.in rename to bootstrap/org.freeciv.gtk322.metainfo.xml.in diff --git a/bootstrap/org.freeciv.mp.gtk3.appdata.xml.in b/bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.mp.gtk3.appdata.xml.in rename to bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in diff --git a/bootstrap/org.freeciv.mp.gtk4.appdata.xml.in b/bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.mp.gtk4.appdata.xml.in rename to bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in diff --git a/bootstrap/org.freeciv.mp.qt.appdata.xml.in b/bootstrap/org.freeciv.mp.qt.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.mp.qt.appdata.xml.in rename to bootstrap/org.freeciv.mp.qt.metainfo.xml.in diff --git a/bootstrap/org.freeciv.qt.appdata.xml.in b/bootstrap/org.freeciv.qt.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.qt.appdata.xml.in rename to bootstrap/org.freeciv.qt.metainfo.xml.in diff --git a/bootstrap/org.freeciv.ruledit.appdata.xml.in b/bootstrap/org.freeciv.ruledit.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.ruledit.appdata.xml.in rename to bootstrap/org.freeciv.ruledit.metainfo.xml.in diff --git a/bootstrap/org.freeciv.sdl2.appdata.xml.in b/bootstrap/org.freeciv.sdl2.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.sdl2.appdata.xml.in rename to bootstrap/org.freeciv.sdl2.metainfo.xml.in diff --git a/bootstrap/org.freeciv.server.appdata.xml.in b/bootstrap/org.freeciv.server.metainfo.xml.in similarity index 100% rename from bootstrap/org.freeciv.server.appdata.xml.in rename to bootstrap/org.freeciv.server.metainfo.xml.in diff --git a/client/.gitignore b/client/.gitignore index 7b2ec65619..10231d3f3f 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -11,9 +11,9 @@ /org.freeciv.gtk322.desktop /org.freeciv.sdl2.desktop /org.freeciv.qt.desktop -/org.freeciv.gtk3.appdata.xml -/org.freeciv.gtk322.appdata.xml -/org.freeciv.sdl2.appdata.xml -/org.freeciv.qt.appdata.xml +/org.freeciv.gtk3.metainfo.xml +/org.freeciv.gtk322.metainfo.xml +/org.freeciv.sdl2.metainfo.xml +/org.freeciv.qt.metainfo.xml /packhand_gen.c /packhand_gen.h diff --git a/client/Makefile.am b/client/Makefile.am index ab309cfcee..ebd3ce8acc 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -14,21 +14,21 @@ GUI_SUBDIRS += gui-sdl2 desktopfile_DATA += \ org.freeciv.sdl2.desktop metainfofile_DATA += \ - org.freeciv.sdl2.appdata.xml + org.freeciv.sdl2.metainfo.xml endif if CLIENT_GUI_GTK_3_0 GUI_SUBDIRS += gui-gtk-3.0 desktopfile_DATA += \ org.freeciv.gtk3.desktop metainfofile_DATA += \ - org.freeciv.gtk3.appdata.xml + org.freeciv.gtk3.metainfo.xml endif if CLIENT_GUI_GTK_3_22 GUI_SUBDIRS += gui-gtk-3.22 desktopfile_DATA += \ org.freeciv.gtk322.desktop metainfofile_DATA += \ - org.freeciv.gtk322.appdata.xml + org.freeciv.gtk322.metainfo.xml endif if CLIENT_GUI_GTK_4 GUI_SUBDIRS += gui-gtk-4.0 @@ -38,7 +38,7 @@ GUI_SUBDIRS += gui-qt desktopfile_DATA += \ org.freeciv.qt.desktop metainfofile_DATA += \ - org.freeciv.qt.appdata.xml + org.freeciv.qt.metainfo.xml endif if CLIENT_GUI_STUB GUI_SUBDIRS += gui-stub diff --git a/configure.ac b/configure.ac index b0dd9b19d6..dba29d140b 100644 --- a/configure.ac +++ b/configure.ac @@ -1901,15 +1901,15 @@ AC_CONFIG_FILES([Makefile tools/fcmp/org.freeciv.mp.gtk4.desktop:bootstrap/org.freeciv.mp.gtk4.desktop.in tools/fcmp/org.freeciv.mp.qt.desktop:bootstrap/org.freeciv.mp.qt.desktop.in tools/ruledit/org.freeciv.ruledit.desktop:bootstrap/org.freeciv.ruledit.desktop.in - client/org.freeciv.gtk3.appdata.xml:bootstrap/org.freeciv.gtk3.appdata.xml.in - client/org.freeciv.gtk322.appdata.xml:bootstrap/org.freeciv.gtk322.appdata.xml.in - client/org.freeciv.sdl2.appdata.xml:bootstrap/org.freeciv.sdl2.appdata.xml.in - client/org.freeciv.qt.appdata.xml:bootstrap/org.freeciv.qt.appdata.xml.in - server/org.freeciv.server.appdata.xml:bootstrap/org.freeciv.server.appdata.xml.in - tools/fcmp/org.freeciv.mp.gtk3.appdata.xml:bootstrap/org.freeciv.mp.gtk3.appdata.xml.in - tools/fcmp/org.freeciv.mp.gtk4.appdata.xml:bootstrap/org.freeciv.mp.gtk4.appdata.xml.in - tools/fcmp/org.freeciv.mp.qt.appdata.xml:bootstrap/org.freeciv.mp.qt.appdata.xml.in - tools/ruledit/org.freeciv.ruledit.appdata.xml:bootstrap/org.freeciv.ruledit.appdata.xml.in]) + client/org.freeciv.gtk3.metainfo.xml:bootstrap/org.freeciv.gtk3.metainfo.xml.in + client/org.freeciv.gtk322.metainfo.xml:bootstrap/org.freeciv.gtk322.metainfo.xml.in + client/org.freeciv.sdl2.metainfo.xml:bootstrap/org.freeciv.sdl2.metainfo.xml.in + client/org.freeciv.qt.metainfo.xml:bootstrap/org.freeciv.qt.metainfo.xml.in + server/org.freeciv.server.metainfo.xml:bootstrap/org.freeciv.server.metainfo.xml.in + tools/fcmp/org.freeciv.mp.gtk3.metainfo.xml:bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in + tools/fcmp/org.freeciv.mp.gtk4.metainfo.xml:bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in + tools/fcmp/org.freeciv.mp.qt.metainfo.xml:bootstrap/org.freeciv.mp.qt.metainfo.xml.in + tools/ruledit/org.freeciv.ruledit.metainfo.xml:bootstrap/org.freeciv.ruledit.metainfo.xml.in]) AC_CONFIG_FILES([fcgui:bootstrap/fcgui.in], [chmod +x fcgui]) AC_CONFIG_FILES([fcser:bootstrap/fcser.in], [chmod +x fcser]) AC_CONFIG_FILES([fcruleup:bootstrap/fcruleup.in], [chmod +x fcruleup]) diff --git a/server/.gitignore b/server/.gitignore index 28c40a156d..12121357ee 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -7,4 +7,4 @@ /hand_gen.c /hand_gen.h /org.freeciv.server.desktop -/org.freeciv.server.appdata.xml +/org.freeciv.server.metainfo.xml diff --git a/server/Makefile.am b/server/Makefile.am index 7b8fb965a5..37c65ca7e3 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -186,4 +186,4 @@ desktopfile_DATA = \ metainfofiledir = @METAINFODIR@ metainfofile_DATA = \ - org.freeciv.server.appdata.xml + org.freeciv.server.metainfo.xml diff --git a/tools/fcmp/.gitignore b/tools/fcmp/.gitignore index bd0dbc98db..796b418a4f 100644 --- a/tools/fcmp/.gitignore +++ b/tools/fcmp/.gitignore @@ -6,10 +6,10 @@ /freeciv-mp-cli /freeciv-mp-gtk3 /org.freeciv.mp.gtk3.desktop -/org.freeciv.mp.gtk3.appdata.xml +/org.freeciv.mp.gtk3.metainfo.xml /freeciv-mp-gtk4 /org.freeciv.mp.gtk4.desktop -/org.freeciv.mp.gtk4.appdata.xml +/org.freeciv.mp.gtk4.metainfo.xml /freeciv-mp-qt /org.freeciv.mp.qt.desktop -/org.freeciv.mp.qt.appdata.xml +/org.freeciv.mp.qt.metainfo.xml diff --git a/tools/fcmp/Makefile.am b/tools/fcmp/Makefile.am index d739a9b3b2..eedb2471e6 100644 --- a/tools/fcmp/Makefile.am +++ b/tools/fcmp/Makefile.am @@ -50,21 +50,21 @@ if MODINST_GTK3 desktopfile_DATA += \ org.freeciv.mp.gtk3.desktop metainfofile_DATA += \ - org.freeciv.mp.gtk3.appdata.xml + org.freeciv.mp.gtk3.metainfo.xml endif if MODINST_GTK4 desktopfile_DATA += \ org.freeciv.mp.gtk4.desktop metainfofile_DATA += \ - org.freeciv.mp.gtk4.appdata.xml + org.freeciv.mp.gtk4.metainfo.xml endif if MODINST_QT desktopfile_DATA += \ org.freeciv.mp.qt.desktop metainfofile_DATA += \ - org.freeciv.mp.qt.appdata.xml + org.freeciv.mp.qt.metainfo.xml endif endif diff --git a/tools/ruledit/.gitignore b/tools/ruledit/.gitignore index 9f9fffbfa7..c8bd81d222 100644 --- a/tools/ruledit/.gitignore +++ b/tools/ruledit/.gitignore @@ -22,4 +22,4 @@ /meta_tab_unit.cpp /freeciv-ruledit /org.freeciv.ruledit.desktop -/org.freeciv.ruledit.appdata.xml +/org.freeciv.ruledit.metainfo.xml diff --git a/tools/ruledit/Makefile.am b/tools/ruledit/Makefile.am index e581d4af03..2e5537e066 100644 --- a/tools/ruledit/Makefile.am +++ b/tools/ruledit/Makefile.am @@ -11,7 +11,7 @@ desktopfiledir = @DESKTOPDIR@ desktopfile_DATA = org.freeciv.ruledit.desktop metainfofiledir = @METAINFODIR@ -metainfofile_DATA = org.freeciv.ruledit.appdata.xml +metainfofile_DATA = org.freeciv.ruledit.metainfo.xml bin_PROGRAMS = freeciv-ruledit -- 2.35.1