From e09696352077cb76af37ff57676a317dae062fbd Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 30 Apr 2022 05:13:30 +0300 Subject: [PATCH 09/30] Rename appdata files as org.freeciv.*.appdata.xml See osdn #44466 Signed-off-by: Marko Lindqvist --- bootstrap/Makefile.am | 17 +++++++++-------- ....xml.in => org.freeciv.gtk3.appdata.xml.in} | 0 ...ml.in => org.freeciv.gtk322.appdata.xml.in} | 0 ...l.in => org.freeciv.mp.gtk3.appdata.xml.in} | 0 ...l.in => org.freeciv.mp.gtk4.appdata.xml.in} | 0 ...xml.in => org.freeciv.mp.qt.appdata.xml.in} | 0 ...ta.xml.in => org.freeciv.qt.appdata.xml.in} | 0 ...l.in => org.freeciv.ruledit.appdata.xml.in} | 0 ....xml.in => org.freeciv.sdl2.appdata.xml.in} | 0 ...ml.in => org.freeciv.server.appdata.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(+), 35 deletions(-) rename bootstrap/{freeciv-gtk3.appdata.xml.in => org.freeciv.gtk3.appdata.xml.in} (100%) rename bootstrap/{freeciv-gtk3.22.appdata.xml.in => org.freeciv.gtk322.appdata.xml.in} (100%) rename bootstrap/{freeciv-mp-gtk3.appdata.xml.in => org.freeciv.mp.gtk3.appdata.xml.in} (100%) rename bootstrap/{freeciv-mp-gtk4.appdata.xml.in => org.freeciv.mp.gtk4.appdata.xml.in} (100%) rename bootstrap/{freeciv-mp-qt.appdata.xml.in => org.freeciv.mp.qt.appdata.xml.in} (100%) rename bootstrap/{freeciv-qt.appdata.xml.in => org.freeciv.qt.appdata.xml.in} (100%) rename bootstrap/{freeciv-ruledit.appdata.xml.in => org.freeciv.ruledit.appdata.xml.in} (100%) rename bootstrap/{freeciv-sdl2.appdata.xml.in => org.freeciv.sdl2.appdata.xml.in} (100%) rename bootstrap/{freeciv-server.appdata.xml.in => org.freeciv.server.appdata.xml.in} (100%) diff --git a/bootstrap/Makefile.am b/bootstrap/Makefile.am index 1ae67ec22b..40dbc8a31f 100644 --- a/bootstrap/Makefile.am +++ b/bootstrap/Makefile.am @@ -26,14 +26,15 @@ EXTRA_DIST = freeciv.project \ org.freeciv.mp.gtk4.desktop.in \ org.freeciv.mp.qt.desktop.in \ org.freeciv.ruledit.desktop.in \ - freeciv-gtk3.appdata.xml.in \ - freeciv-sdl2.appdata.xml.in \ - freeciv-qt.appdata.xml.in \ - freeciv-server.appdata.xml.in \ - freeciv-mp-gtk3.appdata.xml.in \ - freeciv-mp-gtk4.appdata.xml.in \ - freeciv-mp-qt.appdata.xml.in \ - freeciv-ruledit.appdata.xml.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 \ config.rpath \ Makerules.mk \ langnames.txt diff --git a/bootstrap/freeciv-gtk3.appdata.xml.in b/bootstrap/org.freeciv.gtk3.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-gtk3.appdata.xml.in rename to bootstrap/org.freeciv.gtk3.appdata.xml.in diff --git a/bootstrap/freeciv-gtk3.22.appdata.xml.in b/bootstrap/org.freeciv.gtk322.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-gtk3.22.appdata.xml.in rename to bootstrap/org.freeciv.gtk322.appdata.xml.in diff --git a/bootstrap/freeciv-mp-gtk3.appdata.xml.in b/bootstrap/org.freeciv.mp.gtk3.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-mp-gtk3.appdata.xml.in rename to bootstrap/org.freeciv.mp.gtk3.appdata.xml.in diff --git a/bootstrap/freeciv-mp-gtk4.appdata.xml.in b/bootstrap/org.freeciv.mp.gtk4.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-mp-gtk4.appdata.xml.in rename to bootstrap/org.freeciv.mp.gtk4.appdata.xml.in diff --git a/bootstrap/freeciv-mp-qt.appdata.xml.in b/bootstrap/org.freeciv.mp.qt.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-mp-qt.appdata.xml.in rename to bootstrap/org.freeciv.mp.qt.appdata.xml.in diff --git a/bootstrap/freeciv-qt.appdata.xml.in b/bootstrap/org.freeciv.qt.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-qt.appdata.xml.in rename to bootstrap/org.freeciv.qt.appdata.xml.in diff --git a/bootstrap/freeciv-ruledit.appdata.xml.in b/bootstrap/org.freeciv.ruledit.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-ruledit.appdata.xml.in rename to bootstrap/org.freeciv.ruledit.appdata.xml.in diff --git a/bootstrap/freeciv-sdl2.appdata.xml.in b/bootstrap/org.freeciv.sdl2.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-sdl2.appdata.xml.in rename to bootstrap/org.freeciv.sdl2.appdata.xml.in diff --git a/bootstrap/freeciv-server.appdata.xml.in b/bootstrap/org.freeciv.server.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-server.appdata.xml.in rename to bootstrap/org.freeciv.server.appdata.xml.in diff --git a/client/.gitignore b/client/.gitignore index 86feda1364..7b2ec65619 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -11,9 +11,9 @@ /org.freeciv.gtk322.desktop /org.freeciv.sdl2.desktop /org.freeciv.qt.desktop -/freeciv-gtk3.appdata.xml -/freeciv-gtk3.22.appdata.xml -/freeciv-sdl2.appdata.xml -/freeciv-qt.appdata.xml +/org.freeciv.gtk3.appdata.xml +/org.freeciv.gtk322.appdata.xml +/org.freeciv.sdl2.appdata.xml +/org.freeciv.qt.appdata.xml /packhand_gen.c /packhand_gen.h diff --git a/client/Makefile.am b/client/Makefile.am index b65334e58d..ab309cfcee 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 += \ - freeciv-sdl2.appdata.xml + org.freeciv.sdl2.appdata.xml endif if CLIENT_GUI_GTK_3_0 GUI_SUBDIRS += gui-gtk-3.0 desktopfile_DATA += \ org.freeciv.gtk3.desktop metainfofile_DATA += \ - freeciv-gtk3.appdata.xml + org.freeciv.gtk3.appdata.xml endif if CLIENT_GUI_GTK_3_22 GUI_SUBDIRS += gui-gtk-3.22 desktopfile_DATA += \ org.freeciv.gtk322.desktop metainfofile_DATA += \ - freeciv-gtk3.22.appdata.xml + org.freeciv.gtk322.appdata.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 += \ - freeciv-qt.appdata.xml + org.freeciv.qt.appdata.xml endif if CLIENT_GUI_STUB GUI_SUBDIRS += gui-stub diff --git a/configure.ac b/configure.ac index 6d126fb5f6..b953b78e6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1894,15 +1894,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/freeciv-gtk3.appdata.xml:bootstrap/freeciv-gtk3.appdata.xml.in - client/freeciv-gtk3.22.appdata.xml:bootstrap/freeciv-gtk3.22.appdata.xml.in - client/freeciv-sdl2.appdata.xml:bootstrap/freeciv-sdl2.appdata.xml.in - client/freeciv-qt.appdata.xml:bootstrap/freeciv-qt.appdata.xml.in - server/freeciv-server.appdata.xml:bootstrap/freeciv-server.appdata.xml.in - tools/fcmp/freeciv-mp-gtk3.appdata.xml:bootstrap/freeciv-mp-gtk3.appdata.xml.in - tools/fcmp/freeciv-mp-gtk4.appdata.xml:bootstrap/freeciv-mp-gtk4.appdata.xml.in - tools/fcmp/freeciv-mp-qt.appdata.xml:bootstrap/freeciv-mp-qt.appdata.xml.in - tools/ruledit/freeciv-ruledit.appdata.xml:bootstrap/freeciv-ruledit.appdata.xml.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]) 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 cf357e5403..28c40a156d 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -7,4 +7,4 @@ /hand_gen.c /hand_gen.h /org.freeciv.server.desktop -/freeciv-server.appdata.xml +/org.freeciv.server.appdata.xml diff --git a/server/Makefile.am b/server/Makefile.am index 4dd48782d3..7b8fb965a5 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -186,4 +186,4 @@ desktopfile_DATA = \ metainfofiledir = @METAINFODIR@ metainfofile_DATA = \ - freeciv-server.appdata.xml + org.freeciv.server.appdata.xml diff --git a/tools/fcmp/.gitignore b/tools/fcmp/.gitignore index a5e42b6c7c..bd0dbc98db 100644 --- a/tools/fcmp/.gitignore +++ b/tools/fcmp/.gitignore @@ -6,10 +6,10 @@ /freeciv-mp-cli /freeciv-mp-gtk3 /org.freeciv.mp.gtk3.desktop -/freeciv-mp-gtk3.appdata.xml +/org.freeciv.mp.gtk3.appdata.xml /freeciv-mp-gtk4 /org.freeciv.mp.gtk4.desktop -/freeciv-mp-gtk4.appdata.xml +/org.freeciv.mp.gtk4.appdata.xml /freeciv-mp-qt /org.freeciv.mp.qt.desktop -/freeciv-mp-qt.appdata.xml +/org.freeciv.mp.qt.appdata.xml diff --git a/tools/fcmp/Makefile.am b/tools/fcmp/Makefile.am index fef6ba4c76..d739a9b3b2 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 += \ - freeciv-mp-gtk3.appdata.xml + org.freeciv.mp.gtk3.appdata.xml endif if MODINST_GTK4 desktopfile_DATA += \ org.freeciv.mp.gtk4.desktop metainfofile_DATA += \ - freeciv-mp-gtk4.appdata.xml + org.freeciv.mp.gtk4.appdata.xml endif if MODINST_QT desktopfile_DATA += \ org.freeciv.mp.qt.desktop metainfofile_DATA += \ - freeciv-mp-qt.appdata.xml + org.freeciv.mp.qt.appdata.xml endif endif diff --git a/tools/ruledit/.gitignore b/tools/ruledit/.gitignore index d97bcafb53..9f9fffbfa7 100644 --- a/tools/ruledit/.gitignore +++ b/tools/ruledit/.gitignore @@ -22,4 +22,4 @@ /meta_tab_unit.cpp /freeciv-ruledit /org.freeciv.ruledit.desktop -/freeciv-ruledit.appdata.xml +/org.freeciv.ruledit.appdata.xml diff --git a/tools/ruledit/Makefile.am b/tools/ruledit/Makefile.am index a85f8c116e..e581d4af03 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 = freeciv-ruledit.appdata.xml +metainfofile_DATA = org.freeciv.ruledit.appdata.xml bin_PROGRAMS = freeciv-ruledit -- 2.35.1