From 25e030629aed1fda2a75115a7e35b7a0797b7458 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 14 Mar 2022 14:37:37 -0700
Subject: [PATCH] Rename icon files to match full application ID.

This seems to be the convention.  It makes building a flatpak easier.
---
 Smake                                                  | 10 +++++-----
 doc/org.fsf.pspp.desktop.in                            |  2 +-
 doc/org.fsf.pspp.metainfo.xml.in                       |  1 +
 .../scalable/apps/{pspp.svg => org.fsf.pspp.svg}       |  0
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename src/ui/gui/artwork/scalable/apps/{pspp.svg => org.fsf.pspp.svg} (100%)

diff --git a/Smake b/Smake
index 597baea4f2..4bdd8957fe 100644
--- a/Smake
+++ b/Smake
@@ -154,11 +154,11 @@ GNULIB_MODULES = \
 	xvasprintf
 
 APP_ICONS = \
-src/ui/gui/icons/16x16/apps/pspp.png \
-src/ui/gui/icons/32x32/apps/pspp.png \
-src/ui/gui/icons/48x48/apps/pspp.png \
-src/ui/gui/icons/256x256/apps/pspp.png \
-src/ui/gui/icons/scalable/apps/pspp.svg
+src/ui/gui/icons/16x16/apps/org.fsf.pspp.png \
+src/ui/gui/icons/32x32/apps/org.fsf.pspp.png \
+src/ui/gui/icons/48x48/apps/org.fsf.pspp.png \
+src/ui/gui/icons/256x256/apps/org.fsf.pspp.png \
+src/ui/gui/icons/scalable/apps/org.fsf.pspp.svg
 
 CATEGORY_ICONS = \
 src/ui/gui/icons/48x48/categories/align-left.png \
diff --git a/doc/org.fsf.pspp.desktop.in b/doc/org.fsf.pspp.desktop.in
index f5321e2573..6dd5e4dcf1 100644
--- a/doc/org.fsf.pspp.desktop.in
+++ b/doc/org.fsf.pspp.desktop.in
@@ -8,7 +8,7 @@ GenericName=Statistical Software
 Comment=Analyze statistical data with a free alternative to SPSS
 Exec=psppire %F
 # TRANSLATORS: Do not translate this string. Keep it as is, verbatim.
-Icon=pspp
+Icon=org.fsf.pspp
 Terminal=false
 Type=Application
 Categories=GTK;Science;Math;
diff --git a/doc/org.fsf.pspp.metainfo.xml.in b/doc/org.fsf.pspp.metainfo.xml.in
index fe8330dcb5..82e9269ad4 100644
--- a/doc/org.fsf.pspp.metainfo.xml.in
+++ b/doc/org.fsf.pspp.metainfo.xml.in
@@ -30,6 +30,7 @@
     </ul>
     <p>PSPP is particularly aimed at statisticians, social scientists and students requiring fast convenient analysis of sampled data.</p>
   </description>
+  <launchable type="desktop-id">org.fsf.pspp.desktop</launchable>
   <categories>
     <category>Science</category>
     <category>Math</category>
diff --git a/src/ui/gui/artwork/scalable/apps/pspp.svg b/src/ui/gui/artwork/scalable/apps/org.fsf.pspp.svg
similarity index 100%
rename from src/ui/gui/artwork/scalable/apps/pspp.svg
rename to src/ui/gui/artwork/scalable/apps/org.fsf.pspp.svg
-- 
2.30.2