Move org.fsf.pspp.* to doc
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 17 Oct 2020 07:36:20 +0000 (09:36 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 17 Oct 2020 07:37:05 +0000 (09:37 +0200)
org.fsf.pspp.desktop and org.fsf.pspp.metainfo.xml are not part of
the user interface per se.   Rather, they are documentation

doc/automake.mk
doc/org.fsf.pspp.desktop.in [new file with mode: 0644]
doc/org.fsf.pspp.metainfo.xml.in [new file with mode: 0644]
po/automake.mk
src/ui/gui/automake.mk
src/ui/gui/org.fsf.pspp.desktop.in [deleted file]
src/ui/gui/org.fsf.pspp.metainfo.xml.in [deleted file]

index 990a8c458b6d7ca8d46da3e602cac3e44f4ffcb5..ccff271ef339b2148a53f972808e8bef116948da 100644 (file)
@@ -177,3 +177,27 @@ html-local:
 install-html-local: html-local
        $(MKDIR_P) $(DESTDIR)$(prefix)/share/doc/pspp/pspp.html
        $(INSTALL_DATA) ${top_srcdir}/doc/pspp-manual.css $(DESTDIR)$(prefix)/share/doc/pspp/pspp.html
+
+
+\f
+
+mimedir = $(datadir)/mime/packages
+desktopdir = $(datadir)/applications
+
+doc/org.fsf.pspp.metainfo.xml: doc/org.fsf.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)
+       $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po
+
+CLEANFILES+=doc/org.fsf.pspp.desktop \
+            doc/org.fsf.pspp.metainfo.xml
+
+desktop_DATA = doc/org.fsf.pspp.desktop
+
+appdatadir = $(datadir)/metainfo
+dist_appdata_DATA = doc/org.fsf.pspp.metainfo.xml
+
+EXTRA_DIST += doc/org.fsf.pspp.metainfo.xml.in \
+       doc/org.fsf.pspp.desktop.in
diff --git a/doc/org.fsf.pspp.desktop.in b/doc/org.fsf.pspp.desktop.in
new file mode 100644 (file)
index 0000000..f5321e2
--- /dev/null
@@ -0,0 +1,18 @@
+
+# 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=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
new file mode 100644 (file)
index 0000000..c0ae21f
--- /dev/null
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2020 Free Software Foundation -->
+<component type="desktop">
+  <id>org.fsf.pspp</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>GNU PSPP</name>
+  <summary>GNU PSPP is a program for statistical analysis of sampled data</summary>
+  <description>
+    <p>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.</p>
+    <p>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.</p>
+    <p>A brief list of some of PSPP's features.</p>
+    <ul>
+      <li>Support for over 1 billion cases</li>
+      <li>Support for over 1 billion variables</li>
+      <li>Syntax and data files which are compatible with those of SPSS</li>
+      <li>A choice of terminal or graphical user interface</li>
+      <li>A choice of text, postscript, pdf, opendocument or html output formats</li>
+      <li>Inter-operability with: LibreOffice, Apache OpenOffice, Gnumeric and other free software</li>
+      <li>Easy data import from spreadsheets, text files and database sources</li>
+      <li>The capability to open, analyse and edit two or more datasets concurrently</li>
+      <li>A user interface supporting all common character sets</li>
+      <li>The user interface has been translated to multiple languages</li>
+      <li>Very fast statistical procedures, even on very large data sets</li>
+      <li>No license fees and no expiration period</li>
+      <li>No unethical “end user license agreements”</li>
+      <li>A fully indexed user manual</li>
+      <li>Freedom ensured; It is licensed under the GPLv3 or later</li>
+      <li>Portability; Runs on many different computers and many different operating systems</li>
+    </ul>
+    <p>PSPP is particularly aimed at statisticians, social scientists and students requiring fast convenient analysis of sampled data.</p>
+  </description>
+  <categories>
+    <category>Science</category>
+    <category>Math</category>
+    <category>NumericalAnalysis</category>
+    <category>GTK</category>
+  </categories>
+  <screenshots>
+    <screenshot type="default">
+      <caption>GNU PSPP Variable View</caption>
+      <image>https://www.gnu.org/software/pspp/images/variable-sheet.png</image>
+    </screenshot>
+  </screenshots>
+  <translation type="gettext">pspp</translation>
+  <url type="homepage">https://www.gnu.org/software/pspp/</url>
+  <url type="translate">https://translationproject.org/domain/pspp.html</url>
+  <url type="donation">https://my.fsf.org/donate</url>
+  <keywords>
+    <keyword>statistics</keyword>
+  </keywords>
+  <content_rating type="oars-1.0"></content_rating>
+  <update_contact>pspp-dev@gnu.org</update_contact>
+  <developer_name>Free Software Foundation</developer_name>
+  <url type="bugtracker">https://savannah.gnu.org/bugs/?func=additem&amp;group=pspp</url>
+  <url type="help">https://www.gnu.org/software/pspp/manual/html_node/index.html</url>
+  <provides>
+    <binary>pspp</binary>
+    <binary>psppire</binary>
+  </provides>
+  <releases>
+    <release version="1.4.1" date="2020-05-09">
+      <url>http://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.1</url>
+    </release>
+    <release version="1.4.0" date="2020-15-08">
+      <url>http://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.0</url>
+    </release>
+    <release version="1.2.0" date="2018-11-06">
+      <url>http://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.2.0</url>
+    </release>
+  </releases>
+</component>
index d14956e92ec19ce7a4a85c661e370e2665ee405f..0e83674ca8da9c40c270ffe63e9e8da93513fcfb 100644 (file)
@@ -57,15 +57,15 @@ XGETTEXT_OPTIONS = \
 ALL_TRANSLATABLE_FILES = \
        $(TRANSLATABLE_FILES) \
        $(UI_FILES) \
-       src/ui/gui/org.fsf.pspp.metainfo.xml.in \
-       src/ui/gui/org.fsf.pspp.desktop.in
+       doc/org.fsf.pspp.metainfo.xml.in \
+       doc/org.fsf.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 src/ui/gui/org.fsf.pspp.metainfo.xml.in -o $@,tmp
-       $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j src/ui/gui/org.fsf.pspp.desktop.in -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)$(SED) -e '/^"POT-Creation-Date: .*/d' $@,tmp > $@
        rm -f $@,tmp
 
index 2ca50a89dad62b5a7fbfc195365d95965c31b845..ad44170170f7546b271ab3279bfd16065523b6a6 100644 (file)
@@ -72,8 +72,6 @@ UI_FILES = \
 if building_gui
 
 EXTRA_DIST += \
-       src/ui/gui/org.fsf.pspp.metainfo.xml.in \
-       src/ui/gui/org.fsf.pspp.desktop.in \
        src/ui/gui/marshaller-list \
        src/ui/gui/pspplogo.svg
 
@@ -372,16 +370,6 @@ nodist_src_ui_gui_psppire_SOURCES = \
 
 AM_CPPFLAGS += -Isrc
 
-src/ui/gui/org.fsf.pspp.metainfo.xml: src/ui/gui/org.fsf.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
-
-src/ui/gui/org.fsf.pspp.desktop: src/ui/gui/org.fsf.pspp.desktop.in $(POFILES)
-       $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po
-
-CLEANFILES+=src/ui/gui/org.fsf.pspp.desktop \
-            src/ui/gui/org.fsf.pspp.metainfo.xml
-
 src/ui/gui/resources.c: src/ui/gui/resources.xml
        $(AM_V_at)$(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src/ui/gui --generate-source $< --target=$@,out
        $(AM_V_GEN)echo '#include <config.h>' > $@,tmp
@@ -396,14 +384,6 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
-mimedir = $(datadir)/mime/packages
-
-desktopdir = $(datadir)/applications
-desktop_DATA = src/ui/gui/org.fsf.pspp.desktop
-
-appdatadir = $(datadir)/metainfo
-dist_appdata_DATA = src/ui/gui/org.fsf.pspp.metainfo.xml
-
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/ui/gui/resources.c
 
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
diff --git a/src/ui/gui/org.fsf.pspp.desktop.in b/src/ui/gui/org.fsf.pspp.desktop.in
deleted file mode 100644 (file)
index f5321e2..0000000
+++ /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=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/src/ui/gui/org.fsf.pspp.metainfo.xml.in b/src/ui/gui/org.fsf.pspp.metainfo.xml.in
deleted file mode 100644 (file)
index c0ae21f..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2020 Free Software Foundation -->
-<component type="desktop">
-  <id>org.fsf.pspp</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  <name>GNU PSPP</name>
-  <summary>GNU PSPP is a program for statistical analysis of sampled data</summary>
-  <description>
-    <p>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.</p>
-    <p>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.</p>
-    <p>A brief list of some of PSPP's features.</p>
-    <ul>
-      <li>Support for over 1 billion cases</li>
-      <li>Support for over 1 billion variables</li>
-      <li>Syntax and data files which are compatible with those of SPSS</li>
-      <li>A choice of terminal or graphical user interface</li>
-      <li>A choice of text, postscript, pdf, opendocument or html output formats</li>
-      <li>Inter-operability with: LibreOffice, Apache OpenOffice, Gnumeric and other free software</li>
-      <li>Easy data import from spreadsheets, text files and database sources</li>
-      <li>The capability to open, analyse and edit two or more datasets concurrently</li>
-      <li>A user interface supporting all common character sets</li>
-      <li>The user interface has been translated to multiple languages</li>
-      <li>Very fast statistical procedures, even on very large data sets</li>
-      <li>No license fees and no expiration period</li>
-      <li>No unethical “end user license agreements”</li>
-      <li>A fully indexed user manual</li>
-      <li>Freedom ensured; It is licensed under the GPLv3 or later</li>
-      <li>Portability; Runs on many different computers and many different operating systems</li>
-    </ul>
-    <p>PSPP is particularly aimed at statisticians, social scientists and students requiring fast convenient analysis of sampled data.</p>
-  </description>
-  <categories>
-    <category>Science</category>
-    <category>Math</category>
-    <category>NumericalAnalysis</category>
-    <category>GTK</category>
-  </categories>
-  <screenshots>
-    <screenshot type="default">
-      <caption>GNU PSPP Variable View</caption>
-      <image>https://www.gnu.org/software/pspp/images/variable-sheet.png</image>
-    </screenshot>
-  </screenshots>
-  <translation type="gettext">pspp</translation>
-  <url type="homepage">https://www.gnu.org/software/pspp/</url>
-  <url type="translate">https://translationproject.org/domain/pspp.html</url>
-  <url type="donation">https://my.fsf.org/donate</url>
-  <keywords>
-    <keyword>statistics</keyword>
-  </keywords>
-  <content_rating type="oars-1.0"></content_rating>
-  <update_contact>pspp-dev@gnu.org</update_contact>
-  <developer_name>Free Software Foundation</developer_name>
-  <url type="bugtracker">https://savannah.gnu.org/bugs/?func=additem&amp;group=pspp</url>
-  <url type="help">https://www.gnu.org/software/pspp/manual/html_node/index.html</url>
-  <provides>
-    <binary>pspp</binary>
-    <binary>psppire</binary>
-  </provides>
-  <releases>
-    <release version="1.4.1" date="2020-05-09">
-      <url>http://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.1</url>
-    </release>
-    <release version="1.4.0" date="2020-15-08">
-      <url>http://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.4.0</url>
-    </release>
-    <release version="1.2.0" date="2018-11-06">
-      <url>http://git.savannah.gnu.org/cgit/pspp.git/tree/NEWS?h=v1.2.0</url>
-    </release>
-  </releases>
-</component>