Mercurial > octave

changeset 24891:120e75853dab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Mike Miller <mtmiller@octave.org>
date Wed, 14 Mar 2018 18:40:00 -0700
parents 4229c8ea3227 (current diff) d664734ce8eb (diff)
children df131a44310b
files etc/icons/octave.appdata.xml.in etc/icons/octave.desktop.in
diffstat 9 files changed, 109 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Thu Mar 15 00:12:16 2018 +0100
+++ b/Makefile.am	Wed Mar 14 18:40:00 2018 -0700
@@ -97,6 +97,7 @@
 
 image_DATA =
 octdata_DATA =
+octdoc_DATA =
 octetc_DATA =
 octlocale_DATA =
 
@@ -399,7 +400,7 @@
 installdirs-local:
 	$(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE))
 
-install-data-local: installdirs-local doc-interpreter-install-doc-local
+install-data-local: installdirs-local
 
 clean-local: doc-clean
 
--- a/configure.ac	Thu Mar 15 00:12:16 2018 +0100
+++ b/configure.ac	Wed Mar 14 18:40:00 2018 -0700
@@ -214,8 +214,6 @@
 INSTALL_SCRIPT="${INSTALL}"
 AC_SUBST(INSTALL_SCRIPT)
 
-OCTAVE_PROG_DESKTOP_FILE_INSTALL
-
 ## Programs used when running Octave.
 OCTAVE_PROG_GHOSTSCRIPT
 OCTAVE_PROG_GNUPLOT
--- a/doc/interpreter/module.mk	Thu Mar 15 00:12:16 2018 +0100
+++ b/doc/interpreter/module.mk	Wed Mar 14 18:40:00 2018 -0700
@@ -192,20 +192,28 @@
 OCTAVE_CSS = %reldir%/octave.css
 HTMLDIR_CSS = $(OCTAVE_HTML_DIR)/octave.css
 
-OCTAVE_QTHELP_STAMP = %reldir%/.octave-qthelp-stamp
 OCTAVE_QTHELP_FILES = %reldir%/octave_interpreter.qhc %reldir%/octave_interpreter.qch
 
+octdoc_DATA += \
+  $(OCTAVE_QTHELP_FILES)
+
 $(srcdir)/%reldir%/octave.info: $(DOC_IMAGES_TXT) $(octave_TEXINFOS)
 %reldir%/octave.dvi: $(DOC_IMAGES_EPS) $(octave_TEXINFOS)
 %reldir%/octave.pdf: $(DOC_IMAGES_PDF) $(octave_TEXINFOS)
 $(OCTAVE_HTML_STAMP): $(DOC_IMAGES_PNG) $(octave_TEXINFOS)
-$(OCTAVE_QTHELP_FILES): $(OCTAVE_QTHELP_STAMP)
-$(OCTAVE_QTHELP_STAMP): $(OCTAVE_HTML_STAMP) $(srcdir)/%reldir%/prepare_qhelp.py
-	$(AM_V_GEN) rm -f $(OCTAVE_QTHELP_FILES) && \
+
+$(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) $(srcdir)/%reldir%/prepare_qhelp.py
+	$(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \
 	$(PYTHON) $(srcdir)/%reldir%/prepare_qhelp.py %reldir%/octave_interpreter octave.html && \
 	$(QCOLLECTIONGENERATOR) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \
 	rm -f %reldir%/octave_interpreter.qhcp %reldir%/octave_interpreter.qhp
 
+## The Qt help collection generator command produces two output files
+## with the same base name: the compressed help (qch) file and the help
+## collection (qhc) file.  Declare the qhc file to depend on the
+## associated qch file, so that the files are built serially.
+%reldir%/octave_interpreter.qhc: %reldir%/octave_interpreter.qch
+
 $(srcdir)/%reldir%/octave.info: %reldir%/octave.texi $(srcdir)/%reldir%/version-octave.texi
 	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
@@ -296,10 +304,6 @@
 
 $(MUNGED_TEXI_SRC): $(DOCSTRING_FILES)
 
-doc-interpreter-install-doc-local:
-	$(MKDIR_P) $(octdocdir)
-	cp $(OCTAVE_QTHELP_FILES) $(octdocdir)
-
 ## These two texi files have an additional dependency through the
 ## @EXAMPLEFILE macro.
 %reldir%/oop.texi: $(examples_code_SRC)
--- a/etc/icons/octave.appdata.xml.in	Thu Mar 15 00:12:16 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (C) 2013-2017 Carnë Draug
-
-  This file is part of Octave.
-
-  Octave is free software: you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Octave is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Octave; see the file COPYING.  If not, see
-  <https://www.gnu.org/licenses/>.
--->
-<component type="desktop">
-  <id>%OCTAVE_DESKTOP_FILE%</id>
-  <metadata_license>FSFAP</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  <name>GNU Octave</name>
-  <summary>Interactive programming environment for numerical computations</summary>
-
-  <description>
-    <p>
-      GNU Octave is a high-level interpreted language, primarily intended for
-      numerical computations. It provides capabilities for the numerical
-      solution of linear and nonlinear problems, and for performing other
-      numerical experiments. It also provides extensive graphics capabilities
-      for data visualization and manipulation. Octave is normally used through
-      its interactive command line interface, but it can also be used to write
-      non-interactive programs. The Octave language is quite similar to
-      Matlab so that most programs are easily portable.
-    </p>
-    <p>
-      Octave has extensive tools for solving common numerical linear algebra
-      problems, finding the roots of nonlinear equations, integrating ordinary
-      functions, manipulating polynomials, and integrating ordinary
-      differential and differential-algebraic equations. It is easily
-      extensible and customizable via user-defined functions written in
-      Octave's own language, or using dynamically loaded modules written in
-      C++, C, Fortran, or other languages.
-    </p>
-  </description>
-
-  <screenshots>
-    <!--
-      From: https://www.freedesktop.org/software/appstream/docs/
-      All screenshots should have a 16:9 aspect ratio, and should have
-      a width that is no smaller than 620px. Screenshots should be in PNG
-      or JPEG format. PNG is the preferred format.
-    -->
-    <screenshot type="default">
-      <image>https://www.gnu.org/software/octave/img/screenshot.png</image>
-    </screenshot>
-  </screenshots>
-
-  <url type="homepage">http://www.octave.org</url>
-  <update_contact>maintainers@octave.org</update_contact>
-  <project_group>GNU</project_group>
-</component>
--- a/etc/icons/octave.desktop.in	Thu Mar 15 00:12:16 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=GNU Octave
-Comment=Scientific Computing
-Comment[de]=Wissenschaftliches Rechnen
-TryExec=%OCTAVE_PREFIX%/bin/octave
-Exec=%OCTAVE_PREFIX%/bin/octave --force-gui %f
-Icon=octave
-Terminal=false
-Type=Application
-Categories=Education;Science;Math;
-StartupNotify=false
-StartupWMClass=octave-gui
-MimeType=text/x-octave;text/x-matlab;
-Keywords=science;math;matrix;numerical computation;plotting;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/icons/org.octave.Octave.appdata.xml	Wed Mar 14 18:40:00 2018 -0700
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2013-2017 Carnë Draug
+
+  This file is part of Octave.
+
+  Octave is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Octave is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Octave; see the file COPYING.  If not, see
+  <https://www.gnu.org/licenses/>.
+-->
+<component type="desktop">
+  <id>org.octave.Octave.desktop</id>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>GNU Octave</name>
+  <summary>Interactive programming environment for numerical computations</summary>
+
+  <description>
+    <p>
+      GNU Octave is a high-level interpreted language, primarily intended for
+      numerical computations. It provides capabilities for the numerical
+      solution of linear and nonlinear problems, and for performing other
+      numerical experiments. It also provides extensive graphics capabilities
+      for data visualization and manipulation. Octave is normally used through
+      its interactive command line interface, but it can also be used to write
+      non-interactive programs. The Octave language is quite similar to
+      Matlab so that most programs are easily portable.
+    </p>
+    <p>
+      Octave has extensive tools for solving common numerical linear algebra
+      problems, finding the roots of nonlinear equations, integrating ordinary
+      functions, manipulating polynomials, and integrating ordinary
+      differential and differential-algebraic equations. It is easily
+      extensible and customizable via user-defined functions written in
+      Octave's own language, or using dynamically loaded modules written in
+      C++, C, Fortran, or other languages.
+    </p>
+  </description>
+
+  <screenshots>
+    <!--
+      From: https://www.freedesktop.org/software/appstream/docs/
+      All screenshots should have a 16:9 aspect ratio, and should have
+      a width that is no smaller than 620px. Screenshots should be in PNG
+      or JPEG format. PNG is the preferred format.
+    -->
+    <screenshot type="default">
+      <image>https://www.gnu.org/software/octave/img/screenshot.png</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">http://www.octave.org</url>
+  <update_contact>maintainers@octave.org</update_contact>
+  <project_group>GNU</project_group>
+</component>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/icons/org.octave.Octave.desktop.in	Wed Mar 14 18:40:00 2018 -0700
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=GNU Octave
+Comment=Scientific Computing
+Comment[de]=Wissenschaftliches Rechnen
+TryExec=%OCTAVE_PREFIX%/bin/octave
+Exec=%OCTAVE_PREFIX%/bin/octave --gui %f
+Icon=octave
+Terminal=false
+Type=Application
+Categories=Education;Science;Math;
+StartupNotify=false
+StartupWMClass=octave-gui
+MimeType=text/x-octave;text/x-matlab;
+Keywords=science;math;matrix;numerical computation;plotting;
--- a/etc/module.mk	Thu Mar 15 00:12:16 2018 +0100
+++ b/etc/module.mk	Wed Mar 14 18:40:00 2018 -0700
@@ -32,6 +32,16 @@
 %canon_reldir%_EXTRA_DIST += \
   $(etc_fonts_DATA)
 
+appdatadir = $(datadir)/metainfo
+
+appdata_DATA = \
+  %reldir%/icons/org.octave.Octave.appdata.xml
+
+desktopdir = $(datadir)/applications
+
+desktop_DATA = \
+  %reldir%/icons/org.octave.Octave.desktop
+
 icon_IMAGE_FILES = \
   %reldir%/icons/octave-logo.svg \
   %reldir%/icons/octave-sombrero.png
@@ -58,30 +68,22 @@
 %canon_reldir%_EXTRA_DIST += \
   $(BUILT_ICONS) \
   $(icon_IMAGE_FILES) \
-  %reldir%/icons/octave.appdata.xml.in \
-  %reldir%/icons/octave.desktop.in \
-  %reldir%/icons/octave_branding_samples.svg
+  %reldir%/icons/octave_branding_samples.svg \
+  %reldir%/icons/org.octave.Octave.appdata.xml \
+  %reldir%/icons/org.octave.Octave.desktop.in
 
 image_DATA += \
   $(icon_IMAGE_FILES) \
   %reldir%/icons/octave-logo.ico
 
-VENDOR = www.octave.org
-
 DIRSTAMP_FILES += \
   %reldir%/icons/$(octave_dirstamp)
 
 all-local: all-icons
 
-all-icons: %reldir%/icons/octave.appdata.xml %reldir%/icons/octave.desktop $(BUILT_ICONS)
+all-icons: %reldir%/icons/org.octave.Octave.desktop $(BUILT_ICONS)
 
-%reldir%/icons/octave.appdata.xml: %reldir%/icons/octave.appdata.xml.in | %reldir%/icons/$(octave_dirstamp)
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	$(SED) < $< > $@-t \
-	  -e "s|%OCTAVE_DESKTOP_FILE%|${VENDOR}-octave.desktop|" && \
-	mv $@-t $@
-
-%reldir%/icons/octave.desktop: %reldir%/icons/octave.desktop.in | %reldir%/icons/$(octave_dirstamp)
+%reldir%/icons/org.octave.Octave.desktop: %reldir%/icons/org.octave.Octave.desktop.in | %reldir%/icons/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	$(SED) < $< > $@-t \
 	  -e "s|%OCTAVE_PREFIX%|${prefix}|" && \
@@ -102,10 +104,6 @@
 uninstall-local: uninstall-icons
 
 install-icons:
-	-if test -n "$(DESKTOP_FILE_INSTALL)"; then \
-	  $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \
-	    --vendor $(VENDOR) %reldir%/icons/octave.desktop; \
-	fi
 	for f in $(BUILT_PNG_ICONS); do \
 	  size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \
 	  if test -f $$f; then d=; else d="$(srcdir)/"; fi; \
@@ -114,25 +112,18 @@
 	done
 	$(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
 	$(INSTALL_DATA) $(srcdir)/%reldir%/icons/octave-logo.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg
-	$(MKDIR_P) $(DESTDIR)$(datadir)/appdata
-	$(INSTALL_DATA) %reldir%/icons/octave.appdata.xml $(DESTDIR)$(datadir)/appdata/$(VENDOR)-octave.appdata.xml
 
 uninstall-icons:
-	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
-	  rm -f $(DESTDIR)$(datadir)/applications/$(VENDOR)-octave.desktop; \
-	fi
 	for f in $(BUILT_PNG_ICONS); do \
 	  size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \
 	  rm -f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \
 	done
 	rm -f $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg
-	rm -f $(DESTDIR)$(datadir)/appdata/$(VENDOR)-octave.appdata.xml
 
 EXTRA_DIST += $(%canon_reldir%_EXTRA_DIST)
 
 %canon_reldir%_CLEANFILES += \
-  %reldir%/icons/octave.appdata.xml \
-  %reldir%/icons/octave.desktop
+  %reldir%/icons/org.octave.Octave.desktop
 
 %canon_reldir%_MAINTAINERCLEANFILES += \
   $(BUILT_ICONS)
--- a/m4/acinclude.m4	Thu Mar 15 00:12:16 2018 +0100
+++ b/m4/acinclude.m4	Wed Mar 14 18:40:00 2018 -0700
@@ -2841,13 +2841,6 @@
   fi
 ])
 dnl
-dnl Find desktop-file-install program.
-dnl
-AC_DEFUN([OCTAVE_PROG_DESKTOP_FILE_INSTALL], [
-  AC_CHECK_PROG(DESKTOP_FILE_INSTALL, desktop-file-install, desktop-file-install, [])
-  AC_SUBST(DESKTOP_FILE_INSTALL)
-])
-dnl
 dnl Find find program.
 dnl
 ## Prefer GNU find if found.