From 9fafb726a53a2215fa861242351bef43e4f97ad1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 12 Nov 2022 20:17:45 +0200 Subject: [PATCH 17/17] Have plain .desktop files in git and tarball Replace .desktop.in with .desktop See osdn #45869 Signed-off-by: Marko Lindqvist --- bootstrap/Makefile.am | 18 +++++++++--------- ...2.desktop.in => org.freeciv.gtk322.desktop} | 0 ...tk4.desktop.in => org.freeciv.gtk4.desktop} | 0 ....desktop.in => org.freeciv.mp.gtk3.desktop} | 0 ....desktop.in => org.freeciv.mp.gtk4.desktop} | 0 ...qt.desktop.in => org.freeciv.mp.qt.desktop} | 0 ...iv.qt.desktop.in => org.freeciv.qt.desktop} | 0 ....desktop.in => org.freeciv.ruledit.desktop} | 0 ...dl2.desktop.in => org.freeciv.sdl2.desktop} | 0 ...r.desktop.in => org.freeciv.server.desktop} | 0 configure.ac | 11 +---------- 11 files changed, 10 insertions(+), 19 deletions(-) rename bootstrap/{org.freeciv.gtk322.desktop.in => org.freeciv.gtk322.desktop} (100%) rename bootstrap/{org.freeciv.gtk4.desktop.in => org.freeciv.gtk4.desktop} (100%) rename bootstrap/{org.freeciv.mp.gtk3.desktop.in => org.freeciv.mp.gtk3.desktop} (100%) rename bootstrap/{org.freeciv.mp.gtk4.desktop.in => org.freeciv.mp.gtk4.desktop} (100%) rename bootstrap/{org.freeciv.mp.qt.desktop.in => org.freeciv.mp.qt.desktop} (100%) rename bootstrap/{org.freeciv.qt.desktop.in => org.freeciv.qt.desktop} (100%) rename bootstrap/{org.freeciv.ruledit.desktop.in => org.freeciv.ruledit.desktop} (100%) rename bootstrap/{org.freeciv.sdl2.desktop.in => org.freeciv.sdl2.desktop} (100%) rename bootstrap/{org.freeciv.server.desktop.in => org.freeciv.server.desktop} (100%) diff --git a/bootstrap/Makefile.am b/bootstrap/Makefile.am index 91eae62975..3838d149b1 100644 --- a/bootstrap/Makefile.am +++ b/bootstrap/Makefile.am @@ -22,15 +22,15 @@ EXTRA_DIST = freeciv.project \ langstat_core.txt \ langstat_nations.txt \ langstat_ruledit.txt \ - org.freeciv.gtk322.desktop.in \ - org.freeciv.gtk4.desktop.in \ - org.freeciv.sdl2.desktop.in \ - org.freeciv.qt.desktop.in \ - org.freeciv.server.desktop.in \ - org.freeciv.mp.gtk3.desktop.in \ - org.freeciv.mp.gtk4.desktop.in \ - org.freeciv.mp.qt.desktop.in \ - org.freeciv.ruledit.desktop.in \ + org.freeciv.gtk322.desktop \ + org.freeciv.gtk4.desktop \ + 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.ruledit.desktop \ org.freeciv.gtk322.metainfo.xml.in \ org.freeciv.gtk4.metainfo.xml.in \ org.freeciv.sdl2.metainfo.xml.in \ diff --git a/bootstrap/org.freeciv.gtk322.desktop.in b/bootstrap/org.freeciv.gtk322.desktop similarity index 100% rename from bootstrap/org.freeciv.gtk322.desktop.in rename to bootstrap/org.freeciv.gtk322.desktop diff --git a/bootstrap/org.freeciv.gtk4.desktop.in b/bootstrap/org.freeciv.gtk4.desktop similarity index 100% rename from bootstrap/org.freeciv.gtk4.desktop.in rename to bootstrap/org.freeciv.gtk4.desktop diff --git a/bootstrap/org.freeciv.mp.gtk3.desktop.in b/bootstrap/org.freeciv.mp.gtk3.desktop similarity index 100% rename from bootstrap/org.freeciv.mp.gtk3.desktop.in rename to bootstrap/org.freeciv.mp.gtk3.desktop diff --git a/bootstrap/org.freeciv.mp.gtk4.desktop.in b/bootstrap/org.freeciv.mp.gtk4.desktop similarity index 100% rename from bootstrap/org.freeciv.mp.gtk4.desktop.in rename to bootstrap/org.freeciv.mp.gtk4.desktop diff --git a/bootstrap/org.freeciv.mp.qt.desktop.in b/bootstrap/org.freeciv.mp.qt.desktop similarity index 100% rename from bootstrap/org.freeciv.mp.qt.desktop.in rename to bootstrap/org.freeciv.mp.qt.desktop diff --git a/bootstrap/org.freeciv.qt.desktop.in b/bootstrap/org.freeciv.qt.desktop similarity index 100% rename from bootstrap/org.freeciv.qt.desktop.in rename to bootstrap/org.freeciv.qt.desktop diff --git a/bootstrap/org.freeciv.ruledit.desktop.in b/bootstrap/org.freeciv.ruledit.desktop similarity index 100% rename from bootstrap/org.freeciv.ruledit.desktop.in rename to bootstrap/org.freeciv.ruledit.desktop diff --git a/bootstrap/org.freeciv.sdl2.desktop.in b/bootstrap/org.freeciv.sdl2.desktop similarity index 100% rename from bootstrap/org.freeciv.sdl2.desktop.in rename to bootstrap/org.freeciv.sdl2.desktop diff --git a/bootstrap/org.freeciv.server.desktop.in b/bootstrap/org.freeciv.server.desktop similarity index 100% rename from bootstrap/org.freeciv.server.desktop.in rename to bootstrap/org.freeciv.server.desktop diff --git a/configure.ac b/configure.ac index 1c14a60e37..19aa161280 100644 --- a/configure.ac +++ b/configure.ac @@ -1918,16 +1918,7 @@ AC_CONFIG_FILES([Makefile doc/nl/Makefile doc/sv/Makefile bootstrap/Makefile - lua/Makefile - bootstrap/org.freeciv.gtk322.desktop:bootstrap/org.freeciv.gtk322.desktop.in - bootstrap/org.freeciv.gtk4.desktop:bootstrap/org.freeciv.gtk4.desktop.in - bootstrap/org.freeciv.sdl2.desktop:bootstrap/org.freeciv.sdl2.desktop.in - bootstrap/org.freeciv.qt.desktop:bootstrap/org.freeciv.qt.desktop.in - bootstrap/org.freeciv.server.desktop:bootstrap/org.freeciv.server.desktop.in - bootstrap/org.freeciv.mp.gtk3.desktop:bootstrap/org.freeciv.mp.gtk3.desktop.in - bootstrap/org.freeciv.mp.gtk4.desktop:bootstrap/org.freeciv.mp.gtk4.desktop.in - bootstrap/org.freeciv.mp.qt.desktop:bootstrap/org.freeciv.mp.qt.desktop.in - bootstrap/org.freeciv.ruledit.desktop:bootstrap/org.freeciv.ruledit.desktop.in]) + lua/Makefile]) 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]) -- 2.35.1