From: Ben Pfaff Date: Sun, 19 Jun 2022 21:01:09 +0000 (-0700) Subject: Change application ID from org.fsf.pspp to org.gnu.pspp. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=a421d8d9f61bd10bb351117d87d65912ef6be086 Change application ID from org.fsf.pspp to org.gnu.pspp. 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. --- 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.fsf.pspp.desktop.in deleted file mode 100644 index 6dd5e4dcf1..0000000000 --- a/doc/org.fsf.pspp.desktop.in +++ /dev/null @@ -1,18 +0,0 @@ - -# org.fsf.pspp.desktop file is generated with gettext to add -# translations. Edit org.fsf.pspp.desktop.in instead -[Desktop Entry] -# TRANSLATORS: This is the application name in the desktop file -Name=GNU PSPP -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 -Terminal=false -Type=Application -Categories=GTK;Science;Math; -# TRANSLATORS: You must keep all ";" - also at the end of line. -Keywords=statistics;analysis;spss; -MimeType=application/x-spss-sav;application/x-spss-por;application/x-spss-sps;application/x-spss-spv; -StartupNotify=false diff --git a/doc/org.fsf.pspp.metainfo.xml.in b/doc/org.fsf.pspp.metainfo.xml.in deleted file mode 100644 index 46d6256e7d..0000000000 --- a/doc/org.fsf.pspp.metainfo.xml.in +++ /dev/null @@ -1,82 +0,0 @@ - - - - org.fsf.pspp - CC0-1.0 - GPL-3.0+ - GNU PSPP - GNU PSPP is a program for statistical analysis of sampled data - -

GNU PSPP is a program for the statistical analysis of sampled data. It is a Free replacement for the proprietary program SPSS, and appears very similar to it with a few exceptions. The most important of these exceptions are, that there are no “time bombs”; your copy of PSPP will not “expire” or deliberately stop working in the future. Neither are there any artificial limits on the number of cases or variables which you can use. There are no additional packages to purchase in order to get “advanced” functions; all functionality that PSPP currently supports is in the core package.

-

PSPP is a stable and reliable application. It can perform descriptive statistics, T-tests, anova, linear and logistic regression, measures of association, cluster analysis, reliability and factor analysis, non-parametric tests and more. Its backend is designed to perform its analyses as fast as possible, regardless of the size of the input data. You can use PSPP with its graphical interface or the more traditional syntax commands.

-

A brief list of some of PSPP's features.

-
    -
  • Support for over 1 billion cases
    • -
  • Support for over 1 billion variables
    • -
  • Syntax and data files which are compatible with those of SPSS
    • -
  • A choice of terminal or graphical user interface
    • -
  • A choice of text, postscript, pdf, opendocument, html or TeX output formats
    • -
  • Inter-operability with: LibreOffice, Apache OpenOffice, Gnumeric and other free software
    • -
  • Easy data import from spreadsheets, text files and database sources
    • -
  • The capability to open, analyse and edit two or more datasets concurrently
    • -
  • A user interface supporting all common character sets
    • -
  • The user interface has been translated to multiple languages
    • -
  • Very fast statistical procedures, even on very large data sets
    • -
  • No license fees and no expiration period
    • -
  • No unethical “end user license agreements”
    • -
  • A fully indexed user manual
    • -
  • Freedom ensured; It is licensed under the GPLv3 or later
    • -
  • Portability; Runs on many different computers and many different operating systems
    • -
-

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

- - org.fsf.pspp.desktop - - Science - Math - NumericalAnalysis - GTK - - - - GNU PSPP Variable View - https://www.gnu.org/software/pspp/images/variable-sheet.png - - - pspp - https://www.gnu.org/software/pspp/ - https://translationproject.org/domain/pspp.html - https://my.fsf.org/donate - - statistics - - - pspp-dev@gnu.org - Free Software Foundation - https://savannah.gnu.org/bugs/?func=additem&group=pspp - https://www.gnu.org/software/pspp/manual/html_node/index.html - - pspp - psppire - - - - https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.6.0 - - - https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.5.5 - - - https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.5.4 - - - https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.1 - - - https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.0 - - - https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.2.0 - - - diff --git a/doc/org.gnu.pspp.desktop.in b/doc/org.gnu.pspp.desktop.in new file mode 100644 index 0000000000..254d33bf02 --- /dev/null +++ b/doc/org.gnu.pspp.desktop.in @@ -0,0 +1,18 @@ + +# 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 +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.gnu.pspp +Terminal=false +Type=Application +Categories=GTK;Science;Math; +# TRANSLATORS: You must keep all ";" - also at the end of line. +Keywords=statistics;analysis;spss; +MimeType=application/x-spss-sav;application/x-spss-por;application/x-spss-sps;application/x-spss-spv; +StartupNotify=false diff --git a/doc/org.gnu.pspp.metainfo.xml.in b/doc/org.gnu.pspp.metainfo.xml.in new file mode 100644 index 0000000000..7df7b39d5f --- /dev/null +++ b/doc/org.gnu.pspp.metainfo.xml.in @@ -0,0 +1,82 @@ + + + + org.gnu.pspp + CC0-1.0 + GPL-3.0+ + GNU PSPP + GNU PSPP is a program for statistical analysis of sampled data + +

GNU PSPP is a program for the statistical analysis of sampled data. It is a Free replacement for the proprietary program SPSS, and appears very similar to it with a few exceptions. The most important of these exceptions are, that there are no “time bombs”; your copy of PSPP will not “expire” or deliberately stop working in the future. Neither are there any artificial limits on the number of cases or variables which you can use. There are no additional packages to purchase in order to get “advanced” functions; all functionality that PSPP currently supports is in the core package.

+

PSPP is a stable and reliable application. It can perform descriptive statistics, T-tests, anova, linear and logistic regression, measures of association, cluster analysis, reliability and factor analysis, non-parametric tests and more. Its backend is designed to perform its analyses as fast as possible, regardless of the size of the input data. You can use PSPP with its graphical interface or the more traditional syntax commands.

+

A brief list of some of PSPP's features.

+
    +
  • Support for over 1 billion cases
    • +
  • Support for over 1 billion variables
    • +
  • Syntax and data files which are compatible with those of SPSS
    • +
  • A choice of terminal or graphical user interface
    • +
  • A choice of text, postscript, pdf, opendocument, html or TeX output formats
    • +
  • Inter-operability with: LibreOffice, Apache OpenOffice, Gnumeric and other free software
    • +
  • Easy data import from spreadsheets, text files and database sources
    • +
  • The capability to open, analyse and edit two or more datasets concurrently
    • +
  • A user interface supporting all common character sets
    • +
  • The user interface has been translated to multiple languages
    • +
  • Very fast statistical procedures, even on very large data sets
    • +
  • No license fees and no expiration period
    • +
  • No unethical “end user license agreements”
    • +
  • A fully indexed user manual
    • +
  • Freedom ensured; It is licensed under the GPLv3 or later
    • +
  • Portability; Runs on many different computers and many different operating systems
    • +
+

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

+ + org.gnu.pspp.desktop + + Science + Math + NumericalAnalysis + GTK + + + + GNU PSPP Variable View + https://www.gnu.org/software/pspp/images/variable-sheet.png + + + pspp + https://www.gnu.org/software/pspp/ + https://translationproject.org/domain/pspp.html + https://my.fsf.org/donate + + statistics + + + pspp-dev@gnu.org + Free Software Foundation + https://savannah.gnu.org/bugs/?func=additem&group=pspp + https://www.gnu.org/software/pspp/manual/html_node/index.html + + pspp + psppire + + + + https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.6.0 + + + https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.5.5 + + + https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.5.4 + + + https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.1 + + + https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.0 + + + https://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.2.0 + + + diff --git a/org.fsf.pspp.xml b/org.fsf.pspp.xml deleted file mode 100644 index 4f925c4c08..0000000000 --- a/org.fsf.pspp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - SPSS syntax file - SPSS - Statistical Package for the Social Sciences - - - - SPSS output file - SPSS - Statistical Package for the Social Sciences - - - - diff --git a/org.gnu.pspp.xml b/org.gnu.pspp.xml new file mode 100644 index 0000000000..4f925c4c08 --- /dev/null +++ b/org.gnu.pspp.xml @@ -0,0 +1,16 @@ + + + + SPSS syntax file + SPSS + Statistical Package for the Social Sciences + + + + SPSS output file + SPSS + Statistical Package for the Social Sciences + + + + 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.fsf.pspp.svg deleted file mode 100644 index c85ff78703..0000000000 --- a/src/ui/gui/artwork/scalable/apps/org.fsf.pspp.svg +++ /dev/null @@ -1,1338 +0,0 @@ - - - - - Chart - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Chart - Icon adapted for use in GNU PSPP (application icon). Bastián Díaz - - - Jakub Steiner - - - - http://jimmac.musichall.cz/ - - - spreadsheet - chart - pie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ui/gui/artwork/scalable/apps/org.gnu.pspp.svg b/src/ui/gui/artwork/scalable/apps/org.gnu.pspp.svg new file mode 100644 index 0000000000..c85ff78703 --- /dev/null +++ b/src/ui/gui/artwork/scalable/apps/org.gnu.pspp.svg @@ -0,0 +1,1338 @@ + + + + + Chart + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Chart + Icon adapted for use in GNU PSPP (application icon). Bastián Díaz + + + Jakub Steiner + + + + http://jimmac.musichall.cz/ + + + spreadsheet + chart + pie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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);