From bc8a580ab0918eec96de7c6c19456b8ba0f0ad0d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 30 Apr 2022 04:55:39 +0300 Subject: [PATCH 08/19] Rename appdata files as org.freeciv.*.appdata.xml See osdn #44466 Signed-off-by: Marko Lindqvist --- bootstrap/Makefile.am | 21 +++++++++--------- ...xml.in => org.freeciv.gtk2.appdata.xml.in} | 0 ...xml.in => org.freeciv.gtk3.appdata.xml.in} | 0 ...l.in => org.freeciv.gtk322.appdata.xml.in} | 0 ....in => org.freeciv.mp.gtk2.appdata.xml.in} | 0 ....in => org.freeciv.mp.gtk3.appdata.xml.in} | 0 ....in => org.freeciv.mp.gtk4.appdata.xml.in} | 0 ...ml.in => org.freeciv.mp.qt.appdata.xml.in} | 0 ...a.xml.in => org.freeciv.qt.appdata.xml.in} | 0 ....in => org.freeciv.ruledit.appdata.xml.in} | 0 ...xml.in => org.freeciv.sdl2.appdata.xml.in} | 0 ...l.in => org.freeciv.server.appdata.xml.in} | 0 client/.gitignore | 10 ++++----- client/Makefile.am | 10 ++++----- configure.ac | 22 +++++++++---------- server/.gitignore | 2 +- server/Makefile.am | 2 +- tools/.gitignore | 8 +++---- tools/Makefile.am | 8 +++---- tools/ruledit/.gitignore | 2 +- tools/ruledit/Makefile.am | 2 +- 21 files changed, 44 insertions(+), 43 deletions(-) rename bootstrap/{freeciv-gtk2.appdata.xml.in => org.freeciv.gtk2.appdata.xml.in} (100%) 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-gtk2.appdata.xml.in => org.freeciv.mp.gtk2.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 0694aef908..47d63206cc 100644 --- a/bootstrap/Makefile.am +++ b/bootstrap/Makefile.am @@ -27,16 +27,17 @@ EXTRA_DIST = freeciv.project \ org.freeciv.mp.gtk4.desktop.in \ org.freeciv.mp.qt.desktop.in \ org.freeciv.ruledit.desktop.in \ - freeciv-gtk2.appdata.xml.in \ - freeciv-gtk3.appdata.xml.in \ - freeciv-sdl2.appdata.xml.in \ - freeciv-qt.appdata.xml.in \ - freeciv-server.appdata.xml.in \ - freeciv-mp-gtk2.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.gtk2.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.gtk2.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-gtk2.appdata.xml.in b/bootstrap/org.freeciv.gtk2.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-gtk2.appdata.xml.in rename to bootstrap/org.freeciv.gtk2.appdata.xml.in 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-gtk2.appdata.xml.in b/bootstrap/org.freeciv.mp.gtk2.appdata.xml.in similarity index 100% rename from bootstrap/freeciv-mp-gtk2.appdata.xml.in rename to bootstrap/org.freeciv.mp.gtk2.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 1b20e47023..1498764904 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -12,10 +12,10 @@ /org.freeciv.gtk322.desktop /org.freeciv.sdl2.desktop /org.freeciv.qt.desktop -/freeciv-gtk2.appdata.xml -/freeciv-gtk3.appdata.xml -/freeciv-gtk3.22.appdata.xml -/freeciv-sdl2.appdata.xml -/freeciv-qt.appdata.xml +/org.freeciv.gtk2.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 958284aeed..87367586a7 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -14,35 +14,35 @@ GUI_SUBDIRS += gui-sdl2 desktopfile_DATA += \ org.freeciv.sdl2.desktop appdatafile_DATA += \ - freeciv-sdl2.appdata.xml + org.freeciv.sdl2.appdata.xml endif if CLIENT_GUI_GTK_2_0 GUI_SUBDIRS += gui-gtk-2.0 desktopfile_DATA += \ org.freeciv.gtk2.desktop appdatafile_DATA += \ - freeciv-gtk2.appdata.xml + org.freeciv.gtk2.appdata.xml endif if CLIENT_GUI_GTK_3_0 GUI_SUBDIRS += gui-gtk-3.0 desktopfile_DATA += \ org.freeciv.gtk3.desktop appdatafile_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 appdatafile_DATA += \ - freeciv-gtk3.22.appdata.xml + org.freeciv.gtk322.appdata.xml endif if CLIENT_GUI_QT GUI_SUBDIRS += gui-qt desktopfile_DATA += \ org.freeciv.qt.desktop appdatafile_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 974d50c4c0..4e24a714fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1847,17 +1847,17 @@ AC_CONFIG_FILES([Makefile tools/org.freeciv.mp.gtk4.desktop:bootstrap/org.freeciv.mp.gtk4.desktop.in tools/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-gtk2.appdata.xml:bootstrap/freeciv-gtk2.appdata.xml.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/freeciv-mp-gtk2.appdata.xml:bootstrap/freeciv-mp-gtk2.appdata.xml.in - tools/freeciv-mp-gtk3.appdata.xml:bootstrap/freeciv-mp-gtk3.appdata.xml.in - tools/freeciv-mp-gtk4.appdata.xml:bootstrap/freeciv-mp-gtk4.appdata.xml.in - tools/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.gtk2.appdata.xml:bootstrap/org.freeciv.gtk2.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/org.freeciv.mp.gtk2.appdata.xml:bootstrap/org.freeciv.mp.gtk2.appdata.xml.in + tools/org.freeciv.mp.gtk3.appdata.xml:bootstrap/org.freeciv.mp.gtk3.appdata.xml.in + tools/org.freeciv.mp.gtk4.appdata.xml:bootstrap/org.freeciv.mp.gtk4.appdata.xml.in + tools/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 eab8303504..401b1605a5 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -6,4 +6,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 7ba848ceb8..f64a4dde3b 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -193,4 +193,4 @@ desktopfile_DATA = \ appdatafiledir = @APPDATADIR@ appdatafile_DATA = \ - freeciv-server.appdata.xml + org.freeciv.server.appdata.xml diff --git a/tools/.gitignore b/tools/.gitignore index 525f972a5d..0dbb23e9e9 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -7,14 +7,14 @@ /freeciv-mp-cli /freeciv-mp-gtk2 /org.freeciv.mp.gtk2.desktop -/freeciv-mp-gtk2.appdata.xml +/org.freeciv.mp.gtk2.appdata.xml /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 /freeciv-ruleup diff --git a/tools/Makefile.am b/tools/Makefile.am index 00f9c1aa77..5358bf07a6 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -67,28 +67,28 @@ if MODINST_GTK2 desktopfile_DATA += \ org.freeciv.mp.gtk2.desktop appdatafile_DATA += \ - freeciv-mp-gtk2.appdata.xml + org.freeciv.mp.gtk2.appdata.xml endif if MODINST_GTK3 desktopfile_DATA += \ org.freeciv.mp.gtk3.desktop appdatafile_DATA += \ - freeciv-mp-gtk3.appdata.xml + org.freeciv.mp.gtk3.appdata.xml endif if MODINST_GTK4 desktopfile_DATA += \ org.freeciv.mp.gtk4.desktop appdatafile_DATA += \ - freeciv-mp-gtk4.appdata.xml + org.freeciv.mp.gtk4.appdata.xml endif if MODINST_QT desktopfile_DATA += \ org.freeciv.mp.qt.desktop appdatafile_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 2b3cb713ea..e308e71fbb 100644 --- a/tools/ruledit/.gitignore +++ b/tools/ruledit/.gitignore @@ -20,4 +20,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 bb9c110026..8d20b1095b 100644 --- a/tools/ruledit/Makefile.am +++ b/tools/ruledit/Makefile.am @@ -11,7 +11,7 @@ desktopfiledir = @DESKTOPDIR@ desktopfile_DATA = org.freeciv.ruledit.desktop appdatafiledir = @APPDATADIR@ -appdatafile_DATA = freeciv-ruledit.appdata.xml +appdatafile_DATA = org.freeciv.ruledit.appdata.xml bin_PROGRAMS = freeciv-ruledit -- 2.35.1