From a421d8d9f61bd10bb351117d87d65912ef6be086 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 19 Jun 2022 14:01:09 -0700 Subject: [PATCH] Change application ID from org.fsf.pspp to org.gnu.pspp. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This includes changing the argument of gtk_application_new() from "gnu.pspp" to "org.gnu.pspp" for consistency. Suggested by Hubert Figuière at https://github.com/flathub/flathub/pull/3275. --- Makefile.am | 4 ++-- Smake | 10 +++++----- doc/automake.mk | 16 ++++++++-------- ...f.pspp.desktop.in => org.gnu.pspp.desktop.in} | 6 +++--- ...ainfo.xml.in => org.gnu.pspp.metainfo.xml.in} | 4 ++-- org.fsf.pspp.xml => org.gnu.pspp.xml | 0 po/automake.mk | 8 ++++---- .../apps/{org.fsf.pspp.svg => org.gnu.pspp.svg} | 0 src/ui/gui/icons/automake.mk | 4 ++-- src/ui/gui/main.c | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) rename doc/{org.fsf.pspp.desktop.in => org.gnu.pspp.desktop.in} (80%) rename doc/{org.fsf.pspp.metainfo.xml.in => org.gnu.pspp.metainfo.xml.in} (98%) rename org.fsf.pspp.xml => org.gnu.pspp.xml (100%) rename src/ui/gui/artwork/scalable/apps/{org.fsf.pspp.svg => org.gnu.pspp.svg} (100%) diff --git a/Makefile.am b/Makefile.am index 90540f2f87..4dfc50c8ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -157,6 +157,6 @@ $(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) config.h mimedir = $(datadir)/mime/packages -mime_DATA = org.fsf.pspp.xml -EXTRA_DIST += org.fsf.pspp.xml +mime_DATA = org.gnu.pspp.xml +EXTRA_DIST += org.gnu.pspp.xml diff --git a/Smake b/Smake index 4bdd8957fe..543ec0e5b0 100644 --- a/Smake +++ b/Smake @@ -154,11 +154,11 @@ GNULIB_MODULES = \ xvasprintf APP_ICONS = \ -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 +src/ui/gui/icons/16x16/apps/org.gnu.pspp.png \ +src/ui/gui/icons/32x32/apps/org.gnu.pspp.png \ +src/ui/gui/icons/48x48/apps/org.gnu.pspp.png \ +src/ui/gui/icons/256x256/apps/org.gnu.pspp.png \ +src/ui/gui/icons/scalable/apps/org.gnu.pspp.svg CATEGORY_ICONS = \ src/ui/gui/icons/48x48/categories/align-left.png \ diff --git a/doc/automake.mk b/doc/automake.mk index ae2a5c8cde..83209001d1 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -272,23 +272,23 @@ install-html-local: html-local $(HTML_SCREENSHOTS) desktopdir = $(datadir)/applications -doc/org.fsf.pspp.metainfo.xml: doc/org.fsf.pspp.metainfo.xml.in $(POFILES) +doc/org.gnu.pspp.metainfo.xml: doc/org.gnu.pspp.metainfo.xml.in $(POFILES) $(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po || \ $(MSGFMT) -L appdata --xml --template $< -o $@ -d $(top_srcdir)/po -doc/org.fsf.pspp.desktop: doc/org.fsf.pspp.desktop.in $(POFILES) +doc/org.gnu.pspp.desktop: doc/org.gnu.pspp.desktop.in $(POFILES) $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po -CLEANFILES+=doc/org.fsf.pspp.desktop \ - doc/org.fsf.pspp.metainfo.xml +CLEANFILES+=doc/org.gnu.pspp.desktop \ + doc/org.gnu.pspp.metainfo.xml -desktop_DATA = doc/org.fsf.pspp.desktop +desktop_DATA = doc/org.gnu.pspp.desktop appdatadir = $(datadir)/metainfo -dist_appdata_DATA = doc/org.fsf.pspp.metainfo.xml +dist_appdata_DATA = doc/org.gnu.pspp.metainfo.xml -EXTRA_DIST += doc/org.fsf.pspp.metainfo.xml.in \ - doc/org.fsf.pspp.desktop.in +EXTRA_DIST += doc/org.gnu.pspp.metainfo.xml.in \ + doc/org.gnu.pspp.desktop.in diff --git a/doc/org.fsf.pspp.desktop.in b/doc/org.gnu.pspp.desktop.in similarity index 80% rename from doc/org.fsf.pspp.desktop.in rename to doc/org.gnu.pspp.desktop.in index 6dd5e4dcf1..254d33bf02 100644 --- a/doc/org.fsf.pspp.desktop.in +++ b/doc/org.gnu.pspp.desktop.in @@ -1,6 +1,6 @@ -# org.fsf.pspp.desktop file is generated with gettext to add -# translations. Edit org.fsf.pspp.desktop.in instead +# org.gnu.pspp.desktop file is generated with gettext to add +# translations. Edit org.gnu.pspp.desktop.in instead [Desktop Entry] # TRANSLATORS: This is the application name in the desktop file Name=GNU PSPP @@ -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=org.fsf.pspp +Icon=org.gnu.pspp Terminal=false Type=Application Categories=GTK;Science;Math; diff --git a/doc/org.fsf.pspp.metainfo.xml.in b/doc/org.gnu.pspp.metainfo.xml.in similarity index 98% rename from doc/org.fsf.pspp.metainfo.xml.in rename to doc/org.gnu.pspp.metainfo.xml.in index 46d6256e7d..7df7b39d5f 100644 --- a/doc/org.fsf.pspp.metainfo.xml.in +++ b/doc/org.gnu.pspp.metainfo.xml.in @@ -1,7 +1,7 @@ - org.fsf.pspp + org.gnu.pspp CC0-1.0 GPL-3.0+ GNU PSPP @@ -30,7 +30,7 @@

PSPP is particularly aimed at statisticians, social scientists and students requiring fast convenient analysis of sampled data.

- org.fsf.pspp.desktop + org.gnu.pspp.desktop Science Math diff --git a/org.fsf.pspp.xml b/org.gnu.pspp.xml similarity index 100% rename from org.fsf.pspp.xml rename to org.gnu.pspp.xml diff --git a/po/automake.mk b/po/automake.mk index 5d207682c3..f8b326f229 100644 --- a/po/automake.mk +++ b/po/automake.mk @@ -57,15 +57,15 @@ XGETTEXT_OPTIONS = \ ALL_TRANSLATABLE_FILES = \ $(TRANSLATABLE_FILES) \ $(UI_FILES) \ - doc/org.fsf.pspp.metainfo.xml.in \ - doc/org.fsf.pspp.desktop.in + doc/org.gnu.pspp.metainfo.xml.in \ + doc/org.gnu.pspp.desktop.in $(POTFILE): $(ALL_TRANSLATABLE_FILES) Makefile @$(MKDIR_P) po $(AM_V_GEN)$(XGETTEXT) $(XGETTEXT_OPTIONS) $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@,tmp $(AM_V_at)test -z "$(UI_FILES)" || $(XGETTEXT) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=Glade -o $@,tmp - $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.fsf.pspp.metainfo.xml.in -o $@,tmp - $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.fsf.pspp.desktop.in -o $@,tmp + $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.gnu.pspp.metainfo.xml.in -o $@,tmp + $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.gnu.pspp.desktop.in -o $@,tmp $(AM_V_at)mv $@,tmp $@ $(LOCALPOFILES) $(POFILES): $(POTFILE) diff --git a/src/ui/gui/artwork/scalable/apps/org.fsf.pspp.svg b/src/ui/gui/artwork/scalable/apps/org.gnu.pspp.svg similarity index 100% rename from src/ui/gui/artwork/scalable/apps/org.fsf.pspp.svg rename to src/ui/gui/artwork/scalable/apps/org.gnu.pspp.svg diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk index e0116ab73f..8e84c01879 100644 --- a/src/ui/gui/icons/automake.mk +++ b/src/ui/gui/icons/automake.mk @@ -41,7 +41,7 @@ uninstall-ext-icons: (test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \ rm -rf $(themedir)/$$size/$$context/application-x-spss-* ; \ rm -rf $(themedir)/$$size/$$context/pspp* ; \ - rm -rf $(themedir)/$$size/$$context/org.fsf.pspp*; \ + rm -rf $(themedir)/$$size/$$context/org.gnu.pspp*; \ fi ; \ done ; \ done @@ -102,7 +102,7 @@ esac EXTRA_DIST += $(top_srcdir)/src/ui/gui/artwork/splash.svg $(icons) $(icon_srcs) -src/ui/gui/icons/pspp.ico: 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/pspp.ico: src/ui/gui/icons/16x16/apps/org.gnu.pspp.png src/ui/gui/icons/32x32/apps/org.gnu.pspp.png src/ui/gui/icons/48x48/apps/org.gnu.pspp.png src/ui/gui/icons/256x256/apps/org.gnu.pspp.png $(MKDIR_P) ${@D} convert $^ $@ diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 588e16e63c..3241877d85 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -522,7 +522,7 @@ main (int argc, char *argv[]) set_program_name (argv[0]); GtkApplication *app = - gtk_application_new ("gnu.pspp", G_APPLICATION_HANDLES_OPEN); + gtk_application_new ("org.gnu.pspp", G_APPLICATION_HANDLES_OPEN); process_pre_start_arguments (&argc, &argv); -- 2.30.2